database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge 10.1 into 10.2

Browse Source
This commit is contained in:
Marko Mäkelä
2018-11-06 08:41:48 +02:00
parent af9649c722 bae21bfb5d
commit 32062cc61c
277 changed files with 16966 additions and 4246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_plugin.cc
View File

@@ -2197,10 +2197,9 @@ err:
if (argv)
free_defaults(argv);
DBUG_RETURN(error);
#ifdef WITH_WSREP
error:
WSREP_ERROR_LABEL:
DBUG_RETURN(TRUE);
#endif /* WITH_WSREP */
}
@@ -2343,10 +2342,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 */
}