dict0dict.c:

  Fix the bug that the character 0xA0 that EMS MySQL Manager in ALTER TABLE adds after a table name confuses the InnoDB FOREIGN KEY parser, causing an error 121 when we try to add a new constraint; a full fix would require the lexer to be aware of thd->charset_info() and UTF-8
parent d7734fd8
...@@ -2364,6 +2364,8 @@ dict_scan_id( ...@@ -2364,6 +2364,8 @@ dict_scan_id(
ulint len = 0; ulint len = 0;
const char* s; const char* s;
char* d; char* d;
ulint id_len;
byte* b;
*id = NULL; *id = NULL;
...@@ -2425,6 +2427,28 @@ dict_scan_id( ...@@ -2425,6 +2427,28 @@ dict_scan_id(
*id = s; *id = s;
} }
if (heap) {
/* EMS MySQL Manager sometimes adds characters 0xA0 (in
latin1, a 'non-breakable space') to the end of a table name.
But isspace(0xA0) is not true, which confuses our foreign key
parser. After the UTF-8 conversion in ha_innodb.cc, bytes 0xC2
and 0xA0 are at the end of the string.
TODO: we should lex the string using thd->charset_info, and
my_isspace(). Only after that, convert id names to UTF-8. */
b = (byte*)(*id);
id_len = strlen(b);
if (id_len >= 3 && b[id_len - 1] == 0xA0
&& b[id_len - 2] == 0xC2) {
/* Strip the 2 last bytes */
b[id_len - 2] = '\0';
}
}
return(ptr); return(ptr);
} }
...@@ -2479,7 +2503,7 @@ dict_scan_col( ...@@ -2479,7 +2503,7 @@ dict_scan_col(
} }
/************************************************************************* /*************************************************************************
Scans the referenced table name from an SQL string. */ Scans a table name from an SQL string. */
static static
const char* const char*
dict_scan_table_name( dict_scan_table_name(
...@@ -2490,7 +2514,7 @@ dict_scan_table_name( ...@@ -2490,7 +2514,7 @@ dict_scan_table_name(
const char* name, /* in: foreign key table name */ const char* name, /* in: foreign key table name */
ibool* success,/* out: TRUE if ok name found */ ibool* success,/* out: TRUE if ok name found */
mem_heap_t* heap, /* in: heap where to allocate the id */ mem_heap_t* heap, /* in: heap where to allocate the id */
const char** ref_name)/* out,own: the referenced table name; const char** ref_name)/* out,own: the table name;
NULL if no name was scannable */ NULL if no name was scannable */
{ {
const char* database_name = NULL; const char* database_name = NULL;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment