diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 74c153d57e9..2530043a729 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -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;