Skip to content

Commit 7d54d82

Browse files
committed
MDEV-9206 : Disable malloc size callback prior to exit()
my_free() can be called for C++ static destructors after exit(), i.e after the THR_THD used by callback is already destroyed.
1 parent 06cbf7c commit 7d54d82

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

sql/mysqld.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2071,6 +2071,7 @@ static void mysqld_exit(int exit_code)
20712071
#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
20722072
shutdown_performance_schema(); // we do it as late as possible
20732073
#endif
2074+
set_malloc_size_cb(NULL);
20742075
cleanup_tls();
20752076
DBUG_LEAVE;
20762077
sd_notify(0, "STATUS=MariaDB server is down");

0 commit comments

Comments
 (0)