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_plugin.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_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 8d055fd612f..1000fc3711a 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -2185,10 +2185,9 @@ err: if (argv) free_defaults(argv); DBUG_RETURN(error); -#ifdef WITH_WSREP -error: + +WSREP_ERROR_LABEL: DBUG_RETURN(TRUE); -#endif /* WITH_WSREP */ } @@ -2330,10 +2329,9 @@ bool mysql_uninstall_plugin(THD *thd, const LEX_STRING *name, mysql_mutex_unlock(&LOCK_plugin); DBUG_RETURN(error); -#ifdef WITH_WSREP -error: + +WSREP_ERROR_LABEL: DBUG_RETURN(TRUE); -#endif /* WITH_WSREP */ } |