From: Sergey Glukhov
Date: May 19 2009 6:53am
Subject: bzr commit into mysql-6.0-bugteam branch (Sergey.Glukhov:3299)
List-Archive: http://lists.mysql.com/commits/74453
Message-Id: <0KJV008V4SKEMSG0@fe-emea-09.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_scMyzpPcNqFLcPZJiHedMA)"

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

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

 3299 Sergey Glukhov	2009-05-19 [merge]
      5.1-bugteam->6.0-bugteam merge
     @ mysql-test/include/mix1.inc
        5.1-bugteam->6.0-bugteam merge
     @ mysql-test/r/innodb_mysql.result
        5.1-bugteam->6.0-bugteam merge
     @ storage/innobase/dict/dict0dict.c
        5.1-bugteam->6.0-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:45:06 +0000
+++ b/mysql-test/include/mix1.inc	2009-05-19 06:52:26 +0000
@@ -1164,6 +1164,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:45:06 +0000
+++ b/mysql-test/r/innodb_mysql.result	2009-05-19 06:52:26 +0000
@@ -1411,6 +1411,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	2009-01-26 16:03:39 +0000
+++ b/storage/innobase/dict/dict0dict.c	2009-05-19 06:52:26 +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_scMyzpPcNqFLcPZJiHedMA)
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-6.0-bugteam/
# testament_sha1: 753cdab3ce708f5c73c3a57729f9a455a668e576
# timestamp: 2009-05-19 11:53:21 +0500
# source_branch: bzr+ssh://sgluhov@stripped/bzrroot\
#   /server/mysql-6.0-bugteam/
# base_revision_id: ramil@stripped
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWRhJ8m0ACmVfgEAwWff//3/v
3qT////+YBCd77ac3ZgdOFAUCgAUgAdtsNG2AFFCklEqqlUphJJTTZVP9TTVPaR6JPT1NGmkzTUy
eEGkNPUGIyYDSHDTTBDIaaZGTCAaaAMJo0yYAEDQ4aaYIZDTTIyYQDTQBhNGmTAAgaDTJI01IyaA
xqGgBoAABkGgA0NARKEIamNCAmQYBGRR4k8hNqaNPRpDT1NpqBUogIaaEyYTU9BMQhTxTyg9TGoD
NR6gA9TGZ6/XMs2VLnLpTunNtpGJbCWE+V54fokm6L4Q9GrUGYOOlHbr2ZfqeLx7EMQYDcxKdMoQ
xzzi6aZ8Pj0c9GnZY1qayZUnT21We1BTZfZswqGWKzawotxuxvUwkKGlCRnrCo4q3qGAsNcpGC6G
iPETC/5GprFVQEJ/B2i/oBxAWo0kkkjJISEhIHk+SO4yhMxYTkilwrCKQeeLoEQFlUmBhBMgbVqg
whKcu4MFEh3UozUGEiknMS8kHdSd3owNpRFm9kinCdhvLnbqGX6NmomNQjYNc8CcgmJ42jZYrFkk
X3XYMYa8HuCT+eZgWc0HBPcKCUxDIkLRtB7VFoY2HchvE+b3DnMS12s1t79S8v+wDQ3MYO4LsjK2
H6qy5bLYeRRShXfbrYuTkoaMRL2LaT0RMu3j3DAOI5KKbmZcaepFKtCyK2DFhr0rqzmdZh82tNEn
0MM5nGSqNzLFoPhJRlu50Ce99dcCwqVIA5HMfFfeV4X+wHg3n2EPP1Wf2S1y1F6CdnrJztU3iLo4
9z5ewvpd2F1fvNVC57y2gzt77iBDfA0vWhBCgKw9Z5ieZQ06pJJEgSToQ6XqQiFzmr1G4j33iGLm
QqPS3mNzY3h0cbYS4A07bywdiSIWtW7X3OdXiHOQIhBEqIlwVVoc1FOIXa4JDS0/JqQGjHPms0om
STY9y4EklGu1usFisAAiMgsyBRbZg0AOoMXXWdsHB4WpEO9zPHUVC4vKxDxYHzLGCFTQXtLF5xzM
AXNiVbKEYVoqN9RDBaLVq6XoX61wMKIxlyxVVElGgwS+oxWX2zqWv+5VcXtsksfw0nZrfT+X7BmG
IaOGGe6wlKZ067LLcC5Gemu6+taNTV3ZYS1xhjwDX+Jpq00+RsmcLpcpvcPAMcZ+bbixkxtpYeNt
q2m5Cpg6qbiONMb/HTfxroNO2zcasjXp0kyVVXPdStKZE1rLJMKZrGOLBoxWF1EP2zpg0bcK1ppK
UVZ5Qstp42XstnK3fLM5vmtdDJtPjnglFERmWqO5Wq9dpW6WOOHQ0EowODBksbG1RY73/0NTFVJO
C9jMsG7jSlq2iqx96JF9Q1XsYdysNbFCrWiuLWuvpjMJVtb58IZZKaTwqiqGOk6q61sta2DCw1Gh
raWmMmbKXS0NosOXjsbi95zQ3OB1vAZOs3YZ8DdU2Wsy7YVLjoxJQQvLyG0mTiTv1G7m2WTUsYLV
wcKsJsa2pbaq71GlVVpJRfMa57q3qLNzW23/cq0M2njU/Zm0ty1xc1rc0rnF1n4du7nPOcM+lGV2
ycS6Qtuq3MFeUkxollLXN3LPKl2ERpnVqlVy056G875c1XdGLVbpV94anNwmnJMmxo7g3s29cq0b
2dU9OEc6MkUJqmLJO9nKNDYudGJtUceuLBRynMAiHXzPS+foIhVDh1mWNd1Scsx4PFKMumwdj/l6
/kWSyzF50YzozaeLRYa2ZchSQl+C1HR5MNuUqhasmDqvY1favn1YqU2NOXpRDTSaHDDQV4nF6GDd
jDGyl5uzmlYcFFGbtC2fYF893Ny9mxosmdlNWffYzlJsR1NXPC5D8viwQx9VLr9bUys1t7RNijD3
0MmbRYGCs52BqnWtuxVF1kye/Re+Mz2OzOua9nEovMVrY+jW7vlPTkvR8EdqPCbYZ7H1w0u0Nm2n
Pr8ON3Fw1S9WF0tnmzOVJVhNFp+k4zRhuX6nJqa7VNL4KrmsvWNO1TOR9vt61rWta4LZJsTF5ODK
ZHcGE1vVoeezq5S6HSXrmFe+tjlROS4ONFHZw7mGBRwWnMob0y4YS1p1t5Rcuka2LH4sbFFy1Q0t
bNa7mUv2tTNrUYrUwYTcuYGvTpyDEu1Y0pTevQ1WdSxUYil3RRvxKGQUa5e5NbBeyyZXMNEuaVSt
LlJfkvZa1zVralGJpWMm9iseIZI00hlC2VXaNBffCwMNDfRW5CDBKRWrR0lADNqzWI6icQvtyIMe
VoA9rFPe33POxpCQmA0PBqUYxjHkgx9TGMIxU5H7n4d7+oPc97VztGrGxnbFWXD1nQwe17y/vCoi
Yr9r839w1p81+GoeSECQCDCUP+rdv8v6NEP95ihT91y+hZaFxkn4rmdiW0rRuCDg5P0DY/R/T5Ab
RMFgbzk1f6ODgVW9xDQ9ZwNwUhl+GoqBtTuX+AdYbXhfzXhNTk3sYb5jg2bLVLG4dpqa8pmLwzBu
OJzpZubn9g0mCVcd8xeh/FqcFoQmiNHDFc6VDjcLf5sly5jBcQm+ngeYHsU8EKAwgh9wjR9hZIdn
bbvgSEgvpPvPWYVm9Skk3fFgQgfAiQPcRIYg8vbsKg4izlgzHSW2IkBlOQKU8kIH7Py8gSlgeHxI
n2atf5s29q/dwqodXN+5oklEPCF0PyDsuA/KpnULK4AYMeRuQ4GhkK+7joVMjW7I0JWZnoPo4LYa
VMASIOaJOVPKbp0mk0jC3d33NJ2YuxoWKJtej0RMncnSGDUfF4YtrSXFjJk8IdYfycGDp4T4HSHO
ZzjP8CT7pB+fxUe0pD4ObxaHRa9GM3O9zfJpbfO1n0amh4NLzYO25qam4weMP8Yeje3OiM2t48uK
jkq9nidx6EIa3ScN7gEalxnVWH1IvGhmNRgkNbQpDTfDm+WUbYXO1jc8Frm9nFaq1KLXJg+DbNsT
3VTubc1FDZJM38bDGfVMQWM2lE7O5a7zkWcOKm51h0npJP4z0lsKziN8FrHwV9B/jXQe/hKCm/VS
NjMbkFnE69gvFZSKYqVQ6Ct3hrwt6DrNbcXFw5iFIGrNJdLUpOeee+aXm83j9eRNZRRhPjM5wlE+
ySWpxai+tRunCIuQ4Pi+Tx8miQ4+CxasWt1FikrMTW6LbWnhw3ozDVJrUeBg71j6dp46+W1Hcssm
EO0KqxFs5PTX4YzBPKUf1JhIj4LmKGb5plwmiSXiUlVVgYyiDYFkRaE9V8wukz8Ek4neseYexX0W
vF/qdX2zqxUWpR5qtRqYPdRk+1b6lHnNzEwVZqG56+vNYtdlFCcmhyJ8Ybn6w1T7YZQ4pOk7PWao
e5cjOGEq+yW+7zo+p+sOYcIe2pRvRshSigm0NU9loTUs+9EcfvhzfNq7ufefRTYhvKF2gfU6F7GN
ADyoaSFt4BicikPuhZNDvhncsdFZf+PzhbDH4BNk+738obJV6BX6Q4vGHZ2nObEh+EIxTlYT3ZI9
pqHxRGAwlPQ0PwcA593hMOXXBiu9JSBVpRCmL4droavrMTFgxV4jnE5rzpuPIIO90Y1mM4qnVhDv
5z7p5PWE6Ha2HV5cIeqfzO9q7wniG1pR7yk5cQ39zhDe+bCFFIhvmtsYo8pSNnSaA9R+m6F36zYu
h9dIHWHdx0/SGibqQfXKTemM6GDt/JNaI5NzzYPpAPM7DDlcQOmj5DFsBAVsWavtwXwCySX3OFHE
bofVPpOibHaHlCjUPJpn1tDZDfDZJ1ZPpDTNhO93+WyGhw/Ce8LpYj4zQP1U7RHhHRoNbMxE4DaV
qG0EY3bUKAu45FbHcw4GBgQAvJHziUSzNLib5ZD8Z+kvB6wwURMjsTufQNbumMpDQ8awspJFIbJj
7KT52uBrmP4hVBZ3zN8nYogB4RYZzbAEqVYYAljedIJ+ZRe4O62GENZ1Ozjv7QTgiLSbXGbEe8+c
+MksUhlMCapDz254aJohRLJwa55NL6TnDzd/KH4o8ZxmUOKKTIifPf3w3nwncwhp1zi5m/RpQ6nh
anTG4E8R54SHEPq+ORoQwMVX2g2j432NUNTFKpvmoFc+R3WANFxivsQoVL8PSQ9TB2wTChMH2wsT
6Ul71XqvOdcVfLghyuDcMCdXZ0K+8A2NvXpdOkpSPQeI5xjzxRVKSsUVikrnLdLztJzJ7TxZIOS2
H899XnPLOlyByY7zRo0aNGj9XmBHaImqC14KBrei0P5yJbec+VOvZiorWyK1mMsQqhzmiKFDXAor
1aAPtPW5un0cylXWOpDVHyQyVvhQ2nywvl0hcvYyt3U0N7wRxTBK7pCs8mMPJsaKeiYJpX5YKmuR
heuEzIW52pWEAzxXMHpQqDuTafyqdaGQ90/esfve0hdBLN33zebQuUIljMrbM4YPShwtcz3vqMWU
YBGiKZgDiPGhcnChohiUn3z3QeXlDZDH7IekNzaxCt87OE3vCGFjueMLobgs9LGUPKMqFF8umSNZ
4zy6UM5eJyO1DaiaDg9BV+S77wj6bIpyls1BS5KTyhsd8PE6zQ7yJrh3Mv4S+eSbJs+57f0h5QvK
dYdmpRHaapnOmLt9G+e09p34NQx3/8XckU4UJAYSfJtA


--Boundary_(ID_scMyzpPcNqFLcPZJiHedMA)--