From e65703c6bdd9d42fb20f2d090a7fc168552547a5 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 13 Jun 2016 19:44:20 +0200 Subject: cleanup always update global_status_var.global_memory_used through update_global_memory_status() --- sql/sql_class.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sql/sql_class.cc b/sql/sql_class.cc index e7324de4ed2..ccb26e5a713 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -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", (longlong) global_status_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) - int64 volatile * volatile ptr= &to_var->global_memory_used; - my_atomic_add64_explicit(ptr, from_var->global_memory_used, - MY_MEMORY_ORDER_RELAXED); + else + to_var->global_memory_used+= from_var->global_memory_used; } /* -- cgit v1.2.1