diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-03-22 08:11:37 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-03-22 08:11:37 +0100 |
| commit | f1f9c4e4e580a7b060b0c9457afc2eaf7ad3e02d (patch) | |
| tree | 2df02befed23377b3e91511b74295341a143fffc /sql/sys_vars.cc | |
| parent | b6b84d68250ea13a1a90079120e303658465bfb7 (diff) | |
| download | mariadb-git-f1f9c4e4e580a7b060b0c9457afc2eaf7ad3e02d.tar.gz | |
MDEV-26: Global transaction ID.
Fix 3 small issues reported by Pavel Ivanov.
Diffstat (limited to 'sql/sys_vars.cc')
| -rw-r--r-- | sql/sys_vars.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/sys_vars.cc b/sql/sys_vars.cc index 4c8e3050e33..d37fa869042 100644 --- a/sql/sys_vars.cc +++ b/sql/sys_vars.cc @@ -3424,7 +3424,8 @@ bool update_multi_source_variable(sys_var *self_var, THD *thd, bool result= true; Master_info *mi; - mysql_mutex_unlock(&LOCK_global_system_variables); + if (type == OPT_GLOBAL) + mysql_mutex_unlock(&LOCK_global_system_variables); mysql_mutex_lock(&LOCK_active_mi); mi= master_info_index-> get_master_info(&thd->variables.default_master_connection, @@ -3438,7 +3439,8 @@ bool update_multi_source_variable(sys_var *self_var, THD *thd, mysql_mutex_unlock(&mi->rli.run_lock); } mysql_mutex_unlock(&LOCK_active_mi); - mysql_mutex_lock(&LOCK_global_system_variables); + if (type == OPT_GLOBAL) + mysql_mutex_lock(&LOCK_global_system_variables); return result; } |