init plugin psi keys before LOCK_plugin
This commit is contained in:
parent
491f42d50d
commit
f8b4015459
@ -1543,10 +1543,6 @@ int plugin_init(int *argc, char **argv, int flags)
|
||||
|
||||
dlopen_count =0;
|
||||
|
||||
#ifdef HAVE_PSI_INTERFACE
|
||||
init_plugin_psi_keys();
|
||||
#endif
|
||||
|
||||
init_alloc_root(&plugin_mem_root, 4096, 4096, MYF(0));
|
||||
init_alloc_root(&plugin_vars_mem_root, 4096, 4096, MYF(0));
|
||||
init_alloc_root(&tmp_root, 4096, 4096, MYF(0));
|
||||
@ -4288,6 +4284,9 @@ int thd_setspecific(MYSQL_THD thd, MYSQL_THD_KEY_T key, void *value)
|
||||
|
||||
void plugin_mutex_init()
|
||||
{
|
||||
#ifdef HAVE_PSI_INTERFACE
|
||||
init_plugin_psi_keys();
|
||||
#endif
|
||||
mysql_mutex_init(key_LOCK_plugin, &LOCK_plugin, MY_MUTEX_INIT_FAST);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user