diff options
author | Sergey Vojtovich <svoj@mariadb.org> | 2016-06-27 15:01:22 +0400 |
---|---|---|
committer | Sergey Vojtovich <svoj@mariadb.org> | 2016-07-08 23:38:05 +0400 |
commit | ecb27d2650da546c53bf7ff709cc6bf5bfa7f289 (patch) | |
tree | 64b9e34560c78468837c43c7c2333c1cc556e40b /sql/sql_plugin.h | |
parent | 95c286cedf4b9330240a0a91a9fc3e58a17782b9 (diff) | |
download | mariadb-git-ecb27d2650da546c53bf7ff709cc6bf5bfa7f289.tar.gz |
MDEV-10010 - Recursive call to mysql_rwlock_rdlock for LOCK_system_variables_hash
Avoid recursive LOCK_system_variables_hash acquisition in
intern_sys_var_ptr() by pre-syncing dynamic session variables.
Diffstat (limited to 'sql/sql_plugin.h')
-rw-r--r-- | sql/sql_plugin.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_plugin.h b/sql/sql_plugin.h index efa48b22ce8..9483fc8d9b3 100644 --- a/sql/sql_plugin.h +++ b/sql/sql_plugin.h @@ -190,4 +190,5 @@ extern bool plugin_foreach_with_mask(THD *thd, plugin_foreach_func *func, extern bool plugin_dl_foreach(THD *thd, const LEX_STRING *dl, plugin_foreach_func *func, void *arg); +extern void sync_dynamic_session_variables(THD* thd, bool global_lock); #endif |