diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-06-13 19:44:20 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-06-13 19:51:20 +0200 |
| commit | e65703c6bdd9d42fb20f2d090a7fc168552547a5 (patch) | |
| tree | 12124129458c2b9a52d88c55ec6afa50da66fd5b | |
| parent | b2ae32aafdd2787ad456f38833f630182ded25e8 (diff) | |
| download | mariadb-git-e65703c6bdd9d42fb20f2d090a7fc168552547a5.tar.gz | |
cleanup
always update global_status_var.global_memory_used
through update_global_memory_status()
| -rw-r--r-- | sql/sql_class.cc | 7 |
1 files 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; } /* |