From: Sergey Glukhov
Date: May 19 2009 6:48am
Subject: bzr commit into mysql-5.1-bugteam branch (Sergey.Glukhov:2889)
List-Archive: http://lists.mysql.com/commits/74451
Message-Id: <0KJV008KESD1MSE0@fe-emea-09.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_vEZdeQjlgs1mx/S7YApo7w)"

--Boundary_(ID_vEZdeQjlgs1mx/S7YApo7w)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///home/gluh/MySQL/mysql-5.1-bugteam/ based on revid:ramil@stripped

 2889 Sergey Glukhov	2009-05-19 [merge]
      5.0-bugteam->5.1-bugteam merge
     @ mysql-test/include/mix1.inc
        5.0-bugteam->5.1-bugteam merge
     @ mysql-test/r/innodb_mysql.result
        5.0-bugteam->5.1-bugteam merge
     @ storage/innobase/dict/dict0dict.c
        5.0-bugteam->5.1-bugteam merge

    modified:
      mysql-test/include/mix1.inc
      mysql-test/r/innodb_mysql.result
      storage/innobase/dict/dict0dict.c
=== modified file 'mysql-test/include/mix1.inc'
--- a/mysql-test/include/mix1.inc	2009-05-15 13:03:22 +0000
+++ b/mysql-test/include/mix1.inc	2009-05-19 06:48:04 +0000
@@ -1162,6 +1162,15 @@ ROLLBACK;
 --error 1305
 ROLLBACK TO SAVEPOINT s4;
 
+#
+# Bug#39793 Foreign keys not constructed when column has a '#' in a comment or default value
+#
+
+#This statement should be written on a single line for proper testing
+CREATE TABLE t1 (f1 INTEGER PRIMARY KEY COMMENT 'My ID#', f2 INTEGER DEFAULT NULL, f3 CHAR(10) DEFAULT 'My ID#', CONSTRAINT f2_ref FOREIGN KEY (f2) REFERENCES t1 (f1)) ENGINE=INNODB;
+SHOW CREATE TABLE t1;
+DROP TABLE t1;
+
 --echo End of 5.0 tests
 
 # Fix for BUG#19243 "wrong LAST_INSERT_ID() after ON DUPLICATE KEY

=== modified file 'mysql-test/r/innodb_mysql.result'
--- a/mysql-test/r/innodb_mysql.result	2009-05-15 13:03:22 +0000
+++ b/mysql-test/r/innodb_mysql.result	2009-05-19 06:48:04 +0000
@@ -1408,6 +1408,18 @@ SAVEPOINT s4;
 ROLLBACK;
 ROLLBACK TO SAVEPOINT s4;
 ERROR 42000: SAVEPOINT s4 does not exist
+CREATE TABLE t1 (f1 INTEGER PRIMARY KEY COMMENT 'My ID#', f2 INTEGER DEFAULT NULL, f3 CHAR(10) DEFAULT 'My ID#', CONSTRAINT f2_ref FOREIGN KEY (f2) REFERENCES t1 (f1)) ENGINE=INNODB;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f1` int(11) NOT NULL COMMENT 'My ID#',
+  `f2` int(11) DEFAULT NULL,
+  `f3` char(10) DEFAULT 'My ID#',
+  PRIMARY KEY (`f1`),
+  KEY `f2_ref` (`f2`),
+  CONSTRAINT `f2_ref` FOREIGN KEY (`f2`) REFERENCES `t1` (`f1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+DROP TABLE t1;
 End of 5.0 tests
 CREATE TABLE `t2` (
 `k` int(11) NOT NULL auto_increment,

=== modified file 'storage/innobase/dict/dict0dict.c'
--- a/storage/innobase/dict/dict0dict.c	2008-12-14 20:59:50 +0000
+++ b/storage/innobase/dict/dict0dict.c	2009-05-19 06:48:04 +0000
@@ -2616,7 +2616,7 @@ scan_more:
 		} else if (quote) {
 			/* Within quotes: do not look for
 			starting quotes or comments. */
-		} else if (*sptr == '"' || *sptr == '`') {
+		} else if (*sptr == '"' || *sptr == '`' || *sptr == '\'') {
 			/* Starting quote: remember the quote character. */
 			quote = *sptr;
 		} else if (*sptr == '#'


--Boundary_(ID_vEZdeQjlgs1mx/S7YApo7w)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name="bzr/sergey.glukhov@stripped"
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename="bzr/sergey.glukhov@stripped"

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: sergey.glukhov@stripped
# target_branch: file:///home/gluh/MySQL/mysql-5.1-bugteam/
# testament_sha1: 9c29e61bcebe47c6882d3fbd296b713214ff5f7f
# timestamp: 2009-05-19 11:48:56 +0500
# source_branch: bzr+ssh://sgluhov@stripped/bzrroot\
#   /server/mysql-5.1-bugteam/
# base_revision_id: ramil@stripped
# 
# Begin bundle
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
hsNhVr6Dh2/i7kinChIfteNZgA==


--Boundary_(ID_vEZdeQjlgs1mx/S7YApo7w)--