diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 16:05:20 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-04-25 16:05:20 +0300 |
commit | e6bdf77e4be48750c4808a09af197ed91fd69a61 (patch) | |
tree | 2ca921747b9ae7b01835efe9609799b27efb1387 /storage/innobase/dict | |
parent | 1599825ffc2c942f8b63274a9556b425229375c7 (diff) | |
parent | acf6f92aa936fbfe7524617ae57d011ab8f1f96d (diff) | |
download | mariadb-git-e6bdf77e4be48750c4808a09af197ed91fd69a61.tar.gz |
Merge 10.3 into 10.4
In is_eits_usable(), we disable an assertion that fails due to
MDEV-19334.
Diffstat (limited to 'storage/innobase/dict')
-rw-r--r-- | storage/innobase/dict/dict0dict.cc | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/storage/innobase/dict/dict0dict.cc b/storage/innobase/dict/dict0dict.cc index 52639eee462..9c5293d0f9d 100644 --- a/storage/innobase/dict/dict0dict.cc +++ b/storage/innobase/dict/dict0dict.cc @@ -4345,11 +4345,19 @@ dict_create_foreign_constraints_low( } orig = ptr; - ptr = dict_accept(cs, ptr, "TABLE", &success); - - if (!success) { - - goto loop; + for (;;) { + ptr = dict_accept(cs, ptr, "TABLE", &success); + if (success) { + break; + } + ptr = dict_accept(cs, ptr, "ONLINE", &success); + if (success) { + continue; + } + ptr = dict_accept(cs, ptr, "IGNORE", &success); + if (!success) { + goto loop; + } } /* We are doing an ALTER TABLE: scan the table name we are altering */ |