branches/5.1:
branches/5.1:

Merge a change from MySQL (this fixes the failing innodb_mysql test):

  ------------------------------------------------------------
  revno: 1810.3894.10
  committer: Sergey Glukhov <Sergey.Glukhov@sun.com>
  branch nick: mysql-5.0-bugteam
  timestamp: Tue 2009-05-19 11:32:21 +0500
  message:
    Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value
    Internal InnoDN FK parser does not recognize '\'' as quotation symbol.
    Suggested fix is to add '\'' symbol check for quotation condition
    (dict_strip_comments() function).
  modified:
    innobase/dict/dict0dict.c
    mysql-test/r/innodb_mysql.result
    mysql-test/t/innodb_mysql.test


natsys/mariadb_10.2,davidl-zend/zenddbi,natsys/mariadb_10.2,davidl-zend/zenddbi,flynn1973/mariadb-aix,davidl-zend/zenddbi,natsys/mariadb_10.2,ollie314/server,davidl-zend/zenddbi,ollie314/server,ollie314/server,flynn1973/mariadb-aix,natsys/mariadb_10.2,flynn1973/mariadb-aix,natsys/mariadb_10.2,ollie314/server,davidl-zend/zenddbi,davidl-zend/zenddbi,flynn1973/mariadb-aix,davidl-zend/zenddbi,ollie314/server,flynn1973/mariadb-aix,davidl-zend/zenddbi,flynn1973/mariadb-aix,flynn1973/mariadb-aix,ollie314/server,slanterns/server,flynn1973/mariadb-aix,ollie314/server,natsys/mariadb_10.2,flynn1973/mariadb-aix,ollie314/server,natsys/mariadb_10.2,davidl-zend/zenddbi,natsys/mariadb_10.2,ollie314/server,flynn1973/mariadb-aix,flynn1973/mariadb-aix,natsys/mariadb_10.2,ollie314/server,davidl-zend/zenddbi,natsys/mariadb_10.2,natsys/mariadb_10.2,ollie314/server,davidl-zend/zenddbi