diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 16:24:16 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-06 16:24:16 +0200 |
| commit | 074c68409921032f8a64416cc4d5ebc35d95dca9 (patch) | |
| tree | 615c99d326fd2ce8c0e3b533b40f0e4e3475bbc1 /sql/sql_alter.cc | |
| parent | 563efeceece09154f71da6303244b1df36875428 (diff) | |
| parent | df563e0c037f9b2cdb22e145575f92a121b4b529 (diff) | |
| download | mariadb-git-074c68409921032f8a64416cc4d5ebc35d95dca9.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_alter.cc')
| -rw-r--r-- | sql/sql_alter.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sql/sql_alter.cc b/sql/sql_alter.cc index 06147a52004..05a71d7785d 100644 --- a/sql/sql_alter.cc +++ b/sql/sql_alter.cc @@ -497,14 +497,11 @@ bool Sql_cmd_alter_table::execute(THD *thd) lex->ignore); DBUG_RETURN(result); - #ifdef WITH_WSREP -error: /* Used by WSREP_TO_ISOLATION_BEGIN_ALTER */ +wsrep_error_label: + WSREP_WARN("ALTER TABLE isolation failure"); + DBUG_RETURN(TRUE); #endif - { - WSREP_WARN("ALTER TABLE isolation failure"); - DBUG_RETURN(TRUE); - } } bool Sql_cmd_discard_import_tablespace::execute(THD *thd) |