database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

cleanup

Browse Source 
always update global_status_var.global_memory_used
through update_global_memory_status()
This commit is contained in:
Sergei Golubchik
2016-06-13 19:44:20 +02:00
parent b2ae32aafd
commit e65703c6bd
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sql/sql_class.cc
View File

@ -1815,11 +1815,10 @@ void add_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var)
DBUG_PRINT("info", ("global memory_used: %lld size: %lld", DBUG_PRINT("info", ("global memory_used: %lld size: %lld",
(longlong) global_status_var.global_memory_used, (longlong) global_status_var.global_memory_used,
(longlong) from_var->global_memory_used)); (longlong) from_var->global_memory_used));
update_global_memory_status(from_var->global_memory_used);
} }
// workaround for gcc 4.2.4-1ubuntu4 -fPIE (from DEB_BUILD_HARDENING=1) else
int64 volatile * volatile ptr= &to_var->global_memory_used; to_var->global_memory_used+= from_var->global_memory_used;
my_atomic_add64_explicit(ptr, from_var->global_memory_used,
MY_MEMORY_ORDER_RELAXED);
} }
/* /*