mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge 10.2 into 10.3
This commit is contained in:
@ -227,6 +227,7 @@ static DYNAMIC_ARRAY plugin_array;
|
||||
static HASH plugin_hash[MYSQL_MAX_PLUGIN_TYPE_NUM];
|
||||
static MEM_ROOT plugin_mem_root;
|
||||
static bool reap_needed= false;
|
||||
volatile int global_plugin_version= 1;
|
||||
|
||||
static bool initialized= 0;
|
||||
ulong dlopen_count;
|
||||
@ -2217,6 +2218,7 @@ bool mysql_install_plugin(THD *thd, const LEX_CSTRING *name,
|
||||
reap_plugins();
|
||||
}
|
||||
err:
|
||||
global_plugin_version++;
|
||||
mysql_mutex_unlock(&LOCK_plugin);
|
||||
if (argv)
|
||||
free_defaults(argv);
|
||||
@ -2364,6 +2366,7 @@ bool mysql_uninstall_plugin(THD *thd, const LEX_CSTRING *name,
|
||||
}
|
||||
reap_plugins();
|
||||
|
||||
global_plugin_version++;
|
||||
mysql_mutex_unlock(&LOCK_plugin);
|
||||
DBUG_RETURN(error);
|
||||
|
||||
|
Reference in New Issue
Block a user