diff options
| author | Michael Widenius <monty@mariadb.org> | 2018-04-11 11:46:27 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@mariadb.org> | 2018-04-16 20:16:43 +0300 |
| commit | 1074b9b8beae100ec2acd3fbc56baab0b32d4b04 (patch) | |
| tree | ae5f6026aa8de428fe290d55fa9981bc82ef072b | |
| parent | 3bae6a2b9886d185509dce0dacc489dda42152aa (diff) | |
| download | mariadb-git-1074b9b8beae100ec2acd3fbc56baab0b32d4b04.tar.gz | |
Ensure that max_local_memory_used is initialized
| -rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 7b7d34c6bc0..96485ed15ec 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -770,6 +770,7 @@ THD::THD(my_thread_id id, bool is_wsrep_applier, bool skip_global_sys_var_lock) THD *old_THR_THD= current_thd; set_current_thd(this); status_var.local_memory_used= sizeof(THD); + status_var.max_local_memory_used= status_var.local_memory_used; status_var.global_memory_used= 0; variables.pseudo_thread_id= thread_id; variables.max_mem_used= global_system_variables.max_mem_used; @@ -1317,6 +1318,7 @@ void THD::init(bool skip_lock) reset_current_stmt_binlog_format_row(); reset_binlog_local_stmt_filter(); set_status_var_init(); + status_var.max_local_memory_used= status_var.local_memory_used; bzero((char *) &org_status_var, sizeof(org_status_var)); status_in_global= 0; start_bytes_received= 0; |