diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-04 10:30:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-01-04 10:30:45 +0200 |
| commit | daf4fa5238a67fcf47075721d86d4348adab687b (patch) | |
| tree | fff85b8f2e11607c93d806e787475ad82f5055f6 /sql/sql_alter.cc | |
| parent | 756568f26c6a23c537f4d93ff00f485c6291c92e (diff) | |
| parent | 7dfaded9625e832fade4ef1678bcb21c445dad2b (diff) | |
| download | mariadb-git-st-10.8-merge.tar.gz | |
Merge 10.7 into 10.8st-10.8-merge
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 58902fc859f..e28308b4ff6 100644 --- a/sql/sql_alter.cc +++ b/sql/sql_alter.cc @@ -504,7 +504,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; @@ -546,11 +550,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) |