1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

After-merge fix

Browse Source 
mysqld_exit(): Change the assertion failure on
global_status_var.global_memory_used == 0
to fprintf, like in 0bcb65d358087bf94e217254f812f913343a6f5d

It appears that in some cases, that variable may be nonzero
even when LeakSanitizer (WITH_ASAN) would not report errors.
This was observed in 10.4 88cf6f1c7ff5d56138c8b53a5adaca4c61752f86
with the MDEV-22348 test case (Aria startup failure when running
main.default_storage_engine).
This commit is contained in:
Marko Mäkelä 2020-04-23 10:30:58 +03:00
parent 455cf6196c
commit 61c0df9465
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sql/mysqld.cc
View File

@ -2191,10 +2191,10 @@ static void mysqld_exit(int exit_code)
set_malloc_size_cb(NULL);
if (global_status_var.global_memory_used)
{
#ifdef SAFEMALLOC
sf_report_leaked_memory(0);
#endif
DBUG_SLOW_ASSERT(global_status_var.global_memory_used == 0);
fprintf(stderr, "Warning: Memory not freed: %lld\n",
(longlong) global_status_var.global_memory_used);
if (exit_code == 0)
SAFEMALLOC_REPORT_MEMORY(0);
}
cleanup_tls();
DBUG_LEAVE;