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/mysqld.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/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 71298e2ba00..d0081034c0c 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -7558,8 +7558,11 @@ static int show_memory_used(THD *thd, SHOW_VAR *var, char *buff, var->type= SHOW_LONGLONG; var->value= buff; if (scope == OPT_GLOBAL) + { + calc_sum_of_all_status_if_needed(status_var); *(longlong*) buff= (status_var->global_memory_used + status_var->local_memory_used); + } else *(longlong*) buff= status_var->local_memory_used; return 0; |