summaryrefslogtreecommitdiff
path: root/storage/innobase/handler/handler0alter.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2022-10-13 10:05:29 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2022-10-13 10:05:29 +0300
commit588efca2374536aab956e6366f96082f2886c73c (patch)
treeaf1b126c795cd1255d7c7d72c201c01339119755 /storage/innobase/handler/handler0alter.cc
parentb6ebadaa66ee68b1880c0e10669543d1ba058c18 (diff)
parent1feccb505f9ec5cada8f8e2c544f736c1a533633 (diff)
downloadmariadb-git-588efca2374536aab956e6366f96082f2886c73c.tar.gz
Merge 10.6 into 10.7
Diffstat (limited to 'storage/innobase/handler/handler0alter.cc')
-rw-r--r--storage/innobase/handler/handler0alter.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
index fc37143c2dd..544c1eeadc1 100644
--- a/storage/innobase/handler/handler0alter.cc
+++ b/storage/innobase/handler/handler0alter.cc
@@ -9881,7 +9881,7 @@ innobase_update_foreign_cache(
dict_names_t fk_tables;
err = dict_load_foreigns(user_table->name.m_name,
- ctx->col_names, false, 1, true,
+ ctx->col_names, 1, true,
DICT_ERR_IGNORE_NONE,
fk_tables);
@@ -9892,7 +9892,7 @@ innobase_update_foreign_cache(
loaded with "foreign_key checks" off,
so let's retry the loading with charset_check is off */
err = dict_load_foreigns(user_table->name.m_name,
- ctx->col_names, false, 1, false,
+ ctx->col_names, 1, false,
DICT_ERR_IGNORE_NONE,
fk_tables);