diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index 43c4fee4cbe..0c3e67fe0d6 100644
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@@ -1863,7 +1863,7 @@ static void mysqld_exit(int exit_code)
   {
     fprintf(stderr, "Warning: Memory not freed: %lld\n",
             (longlong) global_status_var.global_memory_used);
-    if (exit_code == 0)
+    if (exit_code == 0 || opt_endinfo)
       SAFEMALLOC_REPORT_MEMORY(0);
   }
   DBUG_LEAVE;