mirror of
https://github.com/MariaDB/server.git
synced 2026-05-16 20:07:13 +02:00
Merge hundin.mysql.fi:/home/heikki/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-5.0 innobase/dict/dict0crea.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/fil/fil0fil.c: Auto merged
This commit is contained in:
commit
3cbafff2e0
4 changed files with 85 additions and 25 deletions
|
|
@ -2920,9 +2920,9 @@ loop:
|
|||
constraint_name = NULL;
|
||||
|
||||
if (ptr1 < ptr2) {
|
||||
/* The user has specified a constraint name. Pick it so
|
||||
/* The user may have specified a constraint name. Pick it so
|
||||
that we can store 'databasename/constraintname' as the id of
|
||||
the id of the constraint to system tables. */
|
||||
of the constraint to system tables. */
|
||||
ptr = ptr1;
|
||||
|
||||
ptr = dict_accept(ptr, "CONSTRAINT", &success);
|
||||
|
|
@ -2959,6 +2959,10 @@ loop:
|
|||
|
||||
ptr = dict_accept(ptr, "FOREIGN", &success);
|
||||
|
||||
if (!success) {
|
||||
goto loop;
|
||||
}
|
||||
|
||||
if (!isspace(*ptr)) {
|
||||
goto loop;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue