diff options
| author | unknown <heikki@hundin.mysql.fi> | 2005-01-21 18:16:02 +0200 |
|---|---|---|
| committer | unknown <heikki@hundin.mysql.fi> | 2005-01-21 18:16:02 +0200 |
| commit | 3cbafff2e039f2916212dd8c2cd63fba410d2e23 (patch) | |
| tree | 7125ee2765ee0fbd669fdf7519cf31947c9b3cae /innobase/dict/dict0dict.c | |
| parent | 90f94790986ba8c3938b575d8e5592a7a06471db (diff) | |
| parent | 6eecb8e4e206db57b3d01c07f0482e86af6b4e12 (diff) | |
| download | mariadb-git-3cbafff2e039f2916212dd8c2cd63fba410d2e23.tar.gz | |
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
Diffstat (limited to 'innobase/dict/dict0dict.c')
| -rw-r--r-- | innobase/dict/dict0dict.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c index 12749f7704f..800d7dcd9e9 100644 --- a/innobase/dict/dict0dict.c +++ b/innobase/dict/dict0dict.c @@ -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; } |