diff options
| author | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2021-12-26 12:51:04 +0100 |
|---|---|---|
| committer | Julius Goryavsky <julius.goryavsky@mariadb.com> | 2021-12-26 12:51:04 +0100 |
| commit | 55bb933a880bf048ebc4ce6c6e239dcc8268958d (patch) | |
| tree | a3a24c56995df41758205f8f6a4e3cbccf793a19 /sql/sql_alter.cc | |
| parent | be20b3b03f9c522d17b3454214981506549063eb (diff) | |
| parent | 681b7784b6bb3d735d0a745f5891844f43becc90 (diff) | |
| download | mariadb-git-55bb933a880bf048ebc4ce6c6e239dcc8268958d.tar.gz | |
Merge branch 10.4 into 10.5st-10.5-julius
Diffstat (limited to 'sql/sql_alter.cc')
| -rw-r--r-- | sql/sql_alter.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/sql_alter.cc b/sql/sql_alter.cc index 8562643df97..65f5f347a0a 100644 --- a/sql/sql_alter.cc +++ b/sql/sql_alter.cc @@ -503,7 +503,11 @@ bool Sql_cmd_alter_table::execute(THD *thd) lex->name.str ? lex->name.str : first_table->table_name.str, first_table, &alter_info, &keys, - used_engine ? &create_info : nullptr); + used_engine ? &create_info : nullptr) + { + WSREP_WARN("ALTER TABLE isolation failure"); + DBUG_RETURN(TRUE); + } thd->variables.auto_increment_offset = 1; thd->variables.auto_increment_increment = 1; @@ -545,11 +549,6 @@ bool Sql_cmd_alter_table::execute(THD *thd) lex->ignore, lex->if_exists()); DBUG_RETURN(result); -#ifdef WITH_WSREP -wsrep_error_label: - WSREP_WARN("ALTER TABLE isolation failure"); - DBUG_RETURN(TRUE); -#endif } bool Sql_cmd_discard_import_tablespace::execute(THD *thd) |