diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-17 17:46:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-17 17:46:17 +0200 |
| commit | ed1f52a20662ed07117cc65a0f9cdaf699856a74 (patch) | |
| tree | c51ee8bae9e0e8c87d0c98b3db7a9f71ed2fd3ea /sql/sql_show.cc | |
| parent | 5511c21b41680a8c75f07a002a7362be7d157380 (diff) | |
| parent | 182faa3c06dd54e0364e6f43b4d5d938f94c1743 (diff) | |
| download | mariadb-git-bb-10.4-MDEV-25121.tar.gz | |
WIP merge 10.3 to 10.4bb-10.4-MDEV-25121
FIXME: review main.brackets result change
FIXME: Failing main.subselect* tests
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 ae93bd3107d..8cb82c602d9 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3833,15 +3833,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); |