summaryrefslogtreecommitdiff
path: root/sql/sql_admin.cc
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2018-09-27 17:28:01 +0200
committerSergei Golubchik <serg@mariadb.org>2018-10-24 14:48:08 +0200
commit329058be298a471006e55a674db1c4d769acaf67 (patch)
tree15b06cd31a74ad39aeff25abfb7d48fa4db094f1 /sql/sql_admin.cc
parent0140bfac5e216bd7ba8ad324bd914d596bf59a1f (diff)
downloadmariadb-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_admin.cc')
-rw-r--r--sql/sql_admin.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_admin.cc b/sql/sql_admin.cc
index be23cd3341b..b8881f8f108 100644
--- a/sql/sql_admin.cc
+++ b/sql/sql_admin.cc
@@ -1262,6 +1262,7 @@ bool Sql_cmd_analyze_table::execute(THD *thd)
m_lex->query_tables= first_table;
error:
+WSREP_ERROR_LABEL:
DBUG_RETURN(res);
}
@@ -1320,6 +1321,7 @@ bool Sql_cmd_optimize_table::execute(THD *thd)
m_lex->query_tables= first_table;
error:
+WSREP_ERROR_LABEL:
DBUG_RETURN(res);
}
@@ -1354,5 +1356,6 @@ bool Sql_cmd_repair_table::execute(THD *thd)
m_lex->query_tables= first_table;
error:
+WSREP_ERROR_LABEL:
DBUG_RETURN(res);
}