summaryrefslogtreecommitdiff
path: root/innobase/dict/dict0dict.c
diff options
context:
space:
mode:
authorunknown <sasha@mysql.sashanet.com>2002-03-01 19:36:46 -0700
committerunknown <sasha@mysql.sashanet.com>2002-03-01 19:36:46 -0700
commit2c9879ca0cfd319e939835816cd4501b1d097b0a (patch)
treedd5cbc9c1cf52f454bd88e24e1401696ae7da26c /innobase/dict/dict0dict.c
parent80d375b1566da63bbfcaed6d4ab339ae4add5b04 (diff)
parent1dd4cf0295fcc176ff4ea314afb4ceb8910792ce (diff)
downloadmariadb-git-2c9879ca0cfd319e939835816cd4501b1d097b0a.tar.gz
merged from 3.23 to pull the LOAD DATA INFILE fix as rpl000001 was failing.
Let's hope this did not break anything. Will not push this one until Monty gets back BitKeeper/etc/logging_ok: auto-union Build-tools/Do-all-build-steps: Auto merged Build-tools/Do-compile: Auto merged Build-tools/Do-rpm: Auto merged Docs/manual.texi: Auto merged include/hash.h: Auto merged include/my_sys.h: Auto merged innobase/dict/dict0dict.c: Auto merged mysys/array.c: Auto merged mysys/hash.c: Auto merged mysys/mf_qsort.c: Auto merged sql/sql_base.cc: Auto merged sql/table.cc: Auto merged strings/Makefile.am: Auto merged client/mysql.cc: merged from 3.23 configure.in: merged from 3.23 mysql-test/mysql-test-run.sh: merged from 3.23 sql/mysqld.cc: merged from 3.23 support-files/mysql.spec.sh: merged from 3.23
Diffstat (limited to 'innobase/dict/dict0dict.c')
-rw-r--r--innobase/dict/dict0dict.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/innobase/dict/dict0dict.c b/innobase/dict/dict0dict.c
index efdac031423..91bc770320f 100644
--- a/innobase/dict/dict0dict.c
+++ b/innobase/dict/dict0dict.c
@@ -1987,7 +1987,7 @@ loop:
ptr = dict_accept(ptr, (char *) "FOREIGN", &success);
if (!isspace(*ptr)) {
- return(DB_CANNOT_ADD_CONSTRAINT);
+ goto loop;
}
ptr = dict_accept(ptr, (char *) "KEY", &success);