summaryrefslogtreecommitdiff
path: root/sql/sql_trigger.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_trigger.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_trigger.cc')
-rw-r--r--sql/sql_trigger.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_trigger.cc b/sql/sql_trigger.cc
index 4a484723f02..14e1e84739b 100644
--- a/sql/sql_trigger.cc
+++ b/sql/sql_trigger.cc
@@ -612,10 +612,9 @@ end:
my_ok(thd);
DBUG_RETURN(result);
-#ifdef WITH_WSREP
- error:
+
+WSREP_ERROR_LABEL:
DBUG_RETURN(true);
-#endif /* WITH_WSREP */
}