diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-09-29 11:50:13 +0200 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-11-07 22:45:46 -0500 |
| commit | f8b4015459375857b7ced2f0553ba32dc05276fa (patch) | |
| tree | cc242b942d7c9ecf2897186a50833a42e5691adb | |
| parent | 491f42d50d17f73d7c3dd2460f9cf84b740fe760 (diff) | |
| download | mariadb-git-f8b4015459375857b7ced2f0553ba32dc05276fa.tar.gz | |
init plugin psi keys before LOCK_plugin
| -rw-r--r-- | sql/sql_plugin.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index 2fd0ea341f4..58d6ff4cd00 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -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); } |