diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-09-27 17:28:01 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-10-24 14:48:08 +0200 |
| commit | 329058be298a471006e55a674db1c4d769acaf67 (patch) | |
| tree | 15b06cd31a74ad39aeff25abfb7d48fa4db094f1 /sql/sql_alter.cc | |
| parent | 0140bfac5e216bd7ba8ad324bd914d596bf59a1f (diff) | |
| download | mariadb-git-329058be298a471006e55a674db1c4d769acaf67.tar.gz | |
wsrep: create a macro for the error: label
that is used by WSREP_TO_ISOLATION_BEGIN and other galera macros,
to avoid the need for wrapping this label in #ifdef WITH_WSREP/#endif
Diffstat (limited to 'sql/sql_alter.cc')
| -rw-r--r-- | sql/sql_alter.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sql/sql_alter.cc b/sql/sql_alter.cc index 0accc04c10d..758489ddcfb 100644 --- a/sql/sql_alter.cc +++ b/sql/sql_alter.cc @@ -330,13 +330,10 @@ bool Sql_cmd_alter_table::execute(THD *thd) lex->ignore); DBUG_RETURN(result); -#ifdef WITH_WSREP -error: - { - WSREP_WARN("ALTER TABLE isolation failure"); - DBUG_RETURN(TRUE); - } -#endif /* WITH_WSREP */ + +WSREP_ERROR_LABEL: + WSREP_WARN("ALTER TABLE isolation failure"); + DBUG_RETURN(TRUE); } bool Sql_cmd_discard_import_tablespace::execute(THD *thd) |