database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

remove double-printing of safemalloc report

Browse Source 
and rephrase memory accounting error message to match tmp_space one
(besides, memory accounting error could - and did - happen when all
memory was actually freed)
This commit is contained in:
Sergei Golubchik
2024-05-20 23:11:29 +02:00
parent 381e9adb6c
commit d500c22f6d
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/mysqld.cc
View File

@@ -1939,12 +1939,8 @@ static void mysqld_exit(int exit_code)
#endif #endif
set_malloc_size_cb(NULL); set_malloc_size_cb(NULL);
if (global_status_var.global_memory_used) if (global_status_var.global_memory_used)
{ fprintf(stderr, "Warning: Internal memory accounting error of %lld bytes\n",
fprintf(stderr, "Warning: Memory not freed: %lld\n",
(longlong) global_status_var.global_memory_used); (longlong) global_status_var.global_memory_used);
if (exit_code == 0 || opt_endinfo)
SAFEMALLOC_REPORT_MEMORY(0);
}
if (global_tmp_space_used) if (global_tmp_space_used)
fprintf(stderr, "Warning: Internal tmp_space accounting error of %lld " fprintf(stderr, "Warning: Internal tmp_space accounting error of %lld "
"bytes\n", "bytes\n",