diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-18 12:34:48 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-18 12:34:48 +0200 |
| commit | 19052b6debc1aeb4ef6ccbc36cdc92c10cf968b6 (patch) | |
| tree | 9eec011f81a7c4868283ed02b823771798fe45d4 /sql/sql_show.cc | |
| parent | eb7c5530eccb7d6782077e5562f5a471d2ccbc01 (diff) | |
| parent | c557e9540ab6058713a7c78dfa3df366ea92dd92 (diff) | |
| download | mariadb-git-19052b6debc1aeb4ef6ccbc36cdc92c10cf968b6.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'sql/sql_show.cc')
| -rw-r--r-- | sql/sql_show.cc | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/sql/sql_show.cc b/sql/sql_show.cc index 469f28acf6c..6b020f65c8c 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3799,15 +3799,8 @@ static bool show_status_array(THD *thd, const char *wild, if (show_type == SHOW_SYS) mysql_mutex_lock(&LOCK_global_system_variables); - else if (show_type >= SHOW_LONG_STATUS && scope == OPT_GLOBAL && - !status_var->local_memory_used) - { - mysql_mutex_lock(&LOCK_status); - *status_var= global_status_var; - mysql_mutex_unlock(&LOCK_status); - calc_sum_of_all_status(status_var); - DBUG_ASSERT(status_var->local_memory_used); - } + else if (show_type >= SHOW_LONG_STATUS && scope == OPT_GLOBAL) + calc_sum_of_all_status_if_needed(status_var); pos= get_one_variable(thd, var, scope, show_type, status_var, &charset, buff, &length); |