summaryrefslogtreecommitdiff
path: root/sql/sql_view.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_view.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_view.cc')
-rw-r--r--sql/sql_view.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc
index 6bd6b6a7b63..b7ff4513a32 100644
--- a/sql/sql_view.cc
+++ b/sql/sql_view.cc
@@ -691,10 +691,10 @@ bool mysql_create_view(THD *thd, TABLE_LIST *views,
lex->link_first_table_back(view, link_to_local);
DBUG_RETURN(0);
-#ifdef WITH_WSREP
- error:
+
+WSREP_ERROR_LABEL:
res= TRUE;
-#endif /* WITH_WSREP */
+
err:
THD_STAGE_INFO(thd, stage_end);
lex->link_first_table_back(view, link_to_local);