database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

wsrep: create a macro for the error: label

Browse Source 
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
This commit is contained in:
Sergei Golubchik
2018-09-27 17:28:01 +02:00
parent 0140bfac5e
commit 329058be29
11 changed files with 34 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_plugin.cc
View File

@ -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 */
}