summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty <monty@mariadb.org>2017-11-30 17:02:15 +0200
committerMonty <monty@mariadb.org>2017-12-02 12:04:54 +0200
commitcfaaace635acef042c91d603039f366249ee7878 (patch)
tree24596b795fdf59792fdd621f5b89fcfb9e776e77
parentc65911ac46c4dc002cf0ea219df54ad086ededd8 (diff)
downloadmariadb-git-cfaaace635acef042c91d603039f366249ee7878.tar.gz
Write leaked memory before assert, if compiled with safemalloc
-rw-r--r--sql/mysqld.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 439a8b34047..2f64d45cb38 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -2167,6 +2167,9 @@ static void mysqld_exit(int exit_code)
(long) global_status_var.global_memory_used);
if (!opt_debugging && !my_disable_leak_check && exit_code == 0)
{
+#ifdef SAFEMALLOC
+ sf_report_leaked_memory(0);
+#endif
DBUG_SLOW_ASSERT(global_status_var.global_memory_used == 0);
}
cleanup_tls();