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_acl.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_acl.cc')
| -rw-r--r-- | sql/sql_acl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_acl.cc b/sql/sql_acl.cc index 72d65e14a94..886ff90f35b 100644 --- a/sql/sql_acl.cc +++ b/sql/sql_acl.cc @@ -2861,7 +2861,7 @@ end: close_mysql_tables(thd); #ifdef WITH_WSREP -error: // this label is used in WSREP_TO_ISOLATION_BEGIN +WSREP_ERROR_LABEL: if (WSREP(thd) && !thd->wsrep_applier) { WSREP_TO_ISOLATION_END; @@ -3014,7 +3014,7 @@ end: close_mysql_tables(thd); #ifdef WITH_WSREP -error: // this label is used in WSREP_TO_ISOLATION_END +WSREP_ERROR_LABEL: if (WSREP(thd) && !thd->wsrep_applier) { WSREP_TO_ISOLATION_END; |