diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-02 11:48:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-07-02 11:48:51 +0300 |
| commit | c294443b41bff54eb11ac68f23b9366c0cb9ef90 (patch) | |
| tree | de182800e46ac22dbd6ac3ae510b12f6fcf94837 /sql/sql_table.cc | |
| parent | fa8eb4de554152a673658fed7b3284c76009e208 (diff) | |
| parent | 05f7fd571fca15faecd898c5da8d98455e97c294 (diff) | |
| download | mariadb-git-c294443b41bff54eb11ac68f23b9366c0cb9ef90.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_table.cc')
| -rw-r--r-- | sql/sql_table.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc index 8fe1f34256c..dbe5ac15172 100644 --- a/sql/sql_table.cc +++ b/sql/sql_table.cc @@ -10214,9 +10214,12 @@ do_continue:; if (alter_info->requested_lock == Alter_info::ALTER_TABLE_LOCK_NONE) ha_alter_info.online= true; // Ask storage engine whether to use copy or in-place - ha_alter_info.inplace_supported= - table->file->check_if_supported_inplace_alter(&altered_table, - &ha_alter_info); + { + Check_level_instant_set check_level_save(thd, CHECK_FIELD_WARN); + ha_alter_info.inplace_supported= + table->file->check_if_supported_inplace_alter(&altered_table, + &ha_alter_info); + } if (alter_info->supports_algorithm(thd, &ha_alter_info) || alter_info->supports_lock(thd, &ha_alter_info)) |