diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-10-29 13:03:08 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-10-29 13:03:08 +0100 |
| commit | 0697d75cd052e809b05cc3e812f5e48209c04b4c (patch) | |
| tree | 16524035d92e3d78dc27db00dbc30198aa84db78 /sql/session_tracker.cc | |
| parent | f6549e95448e5cce52336361f5a59d1edcdac46a (diff) | |
| parent | c05e571e7d53ba11a3422490cff0d93e6691ea62 (diff) | |
| download | mariadb-git-10.5-merge.tar.gz | |
Merge commit 'c05e571e7d53ba11a3422490cff0d93e6691ea62' into HEAD10.5-merge
Diffstat (limited to 'sql/session_tracker.cc')
| -rw-r--r-- | sql/session_tracker.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/session_tracker.cc b/sql/session_tracker.cc index 1e5e356a5ba..de82d8be90c 100644 --- a/sql/session_tracker.cc +++ b/sql/session_tracker.cc @@ -445,8 +445,11 @@ bool Session_sysvars_tracker::vars_list::store(THD *thd, String *buf) show.name= svar->name.str; show.value= (char *) svar; + mysql_mutex_lock(&LOCK_global_system_variables); const char *value= get_one_variable(thd, &show, OPT_SESSION, SHOW_SYS, NULL, &charset, val_buf, &val_length); + mysql_mutex_unlock(&LOCK_global_system_variables); + if (is_plugin) mysql_mutex_unlock(&LOCK_plugin); |