diff options
| author | Jimmy Yang <jimmy.yang@oracle.com> | 2011-01-04 22:44:12 -0800 |
|---|---|---|
| committer | Jimmy Yang <jimmy.yang@oracle.com> | 2011-01-04 22:44:12 -0800 |
| commit | 7a9120a119070ff032b388219e062279f92738b1 (patch) | |
| tree | 8283c07c1eaec477f9709586887664a339746741 /storage | |
| parent | 0f412ffb59fea97cd515593e6a39ff27a1742df8 (diff) | |
| download | mariadb-git-7a9120a119070ff032b388219e062279f92738b1.tar.gz | |
Fix Bug #59197 double quote in field comment prevents foreign key
constraint creation
rb://557 Approved by Sunny Bains
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/dict/dict0dict.c | 2 | ||||
| -rw-r--r-- | storage/innodb_plugin/ChangeLog | 5 | ||||
| -rw-r--r-- | storage/innodb_plugin/dict/dict0dict.c | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/storage/innobase/dict/dict0dict.c b/storage/innobase/dict/dict0dict.c index b52a94c3348..fda6555e082 100644 --- a/storage/innobase/dict/dict0dict.c +++ b/storage/innobase/dict/dict0dict.c @@ -2217,7 +2217,7 @@ dict_scan_to( quote = '\0'; } else if (quote) { /* Within quotes: do nothing. */ - } else if (*ptr == '`' || *ptr == '"') { + } else if (*ptr == '`' || *ptr == '"' || *ptr == '\'') { /* Starting quote: remember the quote character. */ quote = *ptr; } else { diff --git a/storage/innodb_plugin/ChangeLog b/storage/innodb_plugin/ChangeLog index ce470a0c027..cf76d0fe432 100644 --- a/storage/innodb_plugin/ChangeLog +++ b/storage/innodb_plugin/ChangeLog @@ -1,3 +1,8 @@ +2011-01-04 The InnoDB Team + * dict/dict0dict.c: + Fix Bug#59197 double quote in field comment prevents foreign + key constraint creation + 2010-12-21 The InnoDB Team * include/btr0cur.h, include/row0upd.h, btr/btr0cur.c, row/row0umod.c, row/row0upd.c: diff --git a/storage/innodb_plugin/dict/dict0dict.c b/storage/innodb_plugin/dict/dict0dict.c index eb3169bd176..67765555658 100644 --- a/storage/innodb_plugin/dict/dict0dict.c +++ b/storage/innodb_plugin/dict/dict0dict.c @@ -2688,7 +2688,7 @@ dict_scan_to( quote = '\0'; } else if (quote) { /* Within quotes: do nothing. */ - } else if (*ptr == '`' || *ptr == '"') { + } else if (*ptr == '`' || *ptr == '"' || *ptr == '\'') { /* Starting quote: remember the quote character. */ quote = *ptr; } else { |