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

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä
2018-11-06 16:24:16 +02:00
parent 563efeceec df563e0c03
commit 074c684099
394 changed files with 24300 additions and 10755 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_plugin.cc
View File

@ -2230,9 +2230,9 @@ err:
free_defaults(argv);
DBUG_RETURN(error == INSTALL_FAIL_NOT_OK);
#ifdef WITH_WSREP
error:
DBUG_RETURN(TRUE);
#endif /* WITH_WSREP */
wsrep_error_label:
DBUG_RETURN(true);
#endif
}
@ -2378,9 +2378,9 @@ bool mysql_uninstall_plugin(THD *thd, const LEX_CSTRING *name,
mysql_mutex_unlock(&LOCK_plugin);
DBUG_RETURN(error);
#ifdef WITH_WSREP
error:
DBUG_RETURN(TRUE);
#endif /* WITH_WSREP */
wsrep_error_label:
DBUG_RETURN(true);
#endif
}