diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-12-11 17:16:15 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-01-15 07:41:13 +0100 |
| commit | 1282eb694c9fb18cac6bace643b4ce275a6a5689 (patch) | |
| tree | be049d91119db4a038144e4742a9c0f48f9c2735 /sql/mysqld.cc | |
| parent | ebb8c9fb26f86cff8c0d81bd2415f415cef952bb (diff) | |
| download | mariadb-git-1282eb694c9fb18cac6bace643b4ce275a6a5689.tar.gz | |
cleanup: make malloc_size_cb_func always defined
Diffstat (limited to 'sql/mysqld.cc')
| -rw-r--r-- | sql/mysqld.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index adb1b273b80..96baaf25287 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -3989,7 +3989,7 @@ static void my_malloc_size_cb_func(long long size, my_bool is_thread_specific) { THD *thd= current_thd; - if (likely(is_thread_specific)) /* If thread specific memory */ + if (is_thread_specific) /* If thread specific memory */ { /* When thread specfic is set, both mysqld_server_initialized and thd @@ -4006,8 +4006,7 @@ static void my_malloc_size_cb_func(long long size, my_bool is_thread_specific) else if (likely(thd)) { DBUG_PRINT("info", ("global thd memory_used: %lld size: %lld", - (longlong) thd->status_var.global_memory_used, - size)); + (longlong) thd->status_var.global_memory_used, size)); thd->status_var.global_memory_used+= size; } else |