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

Bug #53493 : add_to_status does not handle the longlong fields in STATUS_VAR

Browse Source 
bytes_received/bytes_sent are ulonglong so they cannot be handled by the 
ulong handling code in add_to_status/add_diff_to_status().

Fixed by adding code to handle these two variables in 
add_to_status()/add_diff_to_status() and making sure they are not a subject
to the ulong handling code.
This commit is contained in:
Georgi Kodinov 2010-07-14 11:50:17 +03:00
parent 1919414fbe
commit 678640019d
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_class.cc
View File

@ -1063,6 +1063,9 @@ void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var)
while (to != end) while (to != end)
*(to++)+= *(from++); *(to++)+= *(from++);
to_var->bytes_received+= from_var->bytes_received;
to_var->bytes_sent+= from_var->bytes_sent;
} }
/* /*
@ -1088,6 +1091,9 @@ void add_diff_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var,
while (to != end) while (to != end)
*(to++)+= *(from++) - *(dec++); *(to++)+= *(from++) - *(dec++);
to_var->bytes_received+= from_var->bytes_received - dec_var->bytes_received;;
to_var->bytes_sent+= from_var->bytes_sent - dec_var->bytes_sent;
} }

17
sql/sql_class.h
View File

@ -405,12 +405,14 @@ struct system_variables
}; };
/* per thread status variables */ /**
Per thread status variables.
Must be long/ulong up to last_system_status_var so that
add_to_status/add_diff_to_status can work.
*/
typedef struct system_status_var typedef struct system_status_var
{ {
ulonglong bytes_received;
ulonglong bytes_sent;
ulong com_other; ulong com_other;
ulong com_stat[(uint) SQLCOM_END]; ulong com_stat[(uint) SQLCOM_END];
ulong created_tmp_disk_tables; ulong created_tmp_disk_tables;
@ -466,13 +468,14 @@ typedef struct system_status_var
Number of statements sent from the client Number of statements sent from the client
*/ */
ulong questions; ulong questions;
ulonglong bytes_received;
ulonglong bytes_sent;
/* /*
IMPORTANT! IMPORTANT!
SEE last_system_status_var DEFINITION BELOW. SEE last_system_status_var DEFINITION BELOW.
Below 'last_system_status_var' are all variables which doesn't make any Below 'last_system_status_var' are all variables that cannot be handled
sense to add to the /global/ status variable counter. automatically by add_to_status()/add_diff_to_status().
Status variables which it does not make sense to add to
global status variable counter
*/ */
double last_query_cost; double last_query_cost;
} STATUS_VAR; } STATUS_VAR;