1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ensure that max_local_memory_used is initialized

Browse Source
This commit is contained in:
Michael Widenius 2018-04-11 11:46:27 +03:00
parent 3bae6a2b98
commit 1074b9b8be
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_class.cc
View File

@ -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; THD *old_THR_THD= current_thd;
set_current_thd(this); set_current_thd(this);
status_var.local_memory_used= sizeof(THD); status_var.local_memory_used= sizeof(THD);
status_var.max_local_memory_used= status_var.local_memory_used;
status_var.global_memory_used= 0; status_var.global_memory_used= 0;
variables.pseudo_thread_id= thread_id; variables.pseudo_thread_id= thread_id;
variables.max_mem_used= global_system_variables.max_mem_used; 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_current_stmt_binlog_format_row();
reset_binlog_local_stmt_filter(); reset_binlog_local_stmt_filter();
set_status_var_init(); set_status_var_init();
status_var.max_local_memory_used= status_var.local_memory_used;
bzero((char *) &org_status_var, sizeof(org_status_var)); bzero((char *) &org_status_var, sizeof(org_status_var));
status_in_global= 0; status_in_global= 0;
start_bytes_received= 0; start_bytes_received= 0;