diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-19 13:35:18 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-03-19 13:35:18 +0200 |
| commit | 00528a04457d33210baceba1a79e82ea126b48bd (patch) | |
| tree | dab4b198ef2e8a1473d9bbdc9c0fcd879cc4cd3c /sql/sql_show.cc | |
| parent | dbe941e06fe51fe0ff30dff5f1ae62960ff4fc61 (diff) | |
| parent | 233c09138f10830ec07ca6a5277f18d415806ece (diff) | |
| download | mariadb-git-00528a04457d33210baceba1a79e82ea126b48bd.tar.gz | |
Merge 10.5 into 10.6
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 f706b99a195..a5c9b505ec1 100644 --- a/sql/sql_show.cc +++ b/sql/sql_show.cc @@ -3775,15 +3775,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); |