diff options
| -rw-r--r-- | sql/mysqld.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 83e93110ad1..9cc841be735 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -2172,13 +2172,12 @@ static void mysqld_exit(int exit_code) shutdown_performance_schema(); // we do it as late as possible #endif set_malloc_size_cb(NULL); - if (opt_endinfo && global_status_var.global_memory_used) - fprintf(stderr, "Warning: Memory not freed: %ld\n", - (long) global_status_var.global_memory_used); - if (!opt_debugging && !my_disable_leak_check && exit_code == 0 && - debug_assert_on_not_freed_memory) + if (global_status_var.global_memory_used) { - DBUG_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; |