summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2022-05-25 22:08:40 +0200
committerNikita Malyavin <nikitamalyavin@gmail.com>2022-10-17 15:24:44 +0300
commit75700e9c503a5c022c8c0961b62e52aba3c93578 (patch)
treed80453800785e29298123af11847e621d2041cc2
parent2ac796320df049ba791c1d85ff6fa66c9793a4f4 (diff)
downloadmariadb-git-75700e9c503a5c022c8c0961b62e52aba3c93578.tar.gz
online alter always uses ALGORITHM=COPY, LOCK=NONE
so any other value of ALGORITHM or LOCK disables online alter
-rw-r--r--sql/sql_table.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_table.cc b/sql/sql_table.cc
index 23b4a95f9d5..3ebbde3174a 100644
--- a/sql/sql_table.cc
+++ b/sql/sql_table.cc
@@ -10433,10 +10433,10 @@ bool mysql_alter_table(THD *thd, const LEX_CSTRING *new_db,
table_list->required_type= TABLE_TYPE_NORMAL;
if (alter_info->requested_lock == Alter_info::ALTER_TABLE_LOCK_SHARED
- || alter_info->requested_lock == Alter_info::ALTER_TABLE_LOCK_EXCLUSIVE
+ || alter_info->requested_lock > Alter_info::ALTER_TABLE_LOCK_NONE
|| thd->locked_tables_mode == LTM_LOCK_TABLES
|| thd->lex->sql_command == SQLCOM_OPTIMIZE
- || alter_info->algorithm(thd) == Alter_info::ALTER_TABLE_ALGORITHM_NOCOPY)
+ || alter_info->algorithm(thd) > Alter_info::ALTER_TABLE_ALGORITHM_COPY)
online= false;
if (online)