From 55d9781de318581368d4b94c12ce4e2205f6f23f Mon Sep 17 00:00:00 2001
From: unknown <wax@kishkin.ru>
Date: Sun, 2 Jan 2005 19:58:49 +0500
Subject: WL#964 move my_end() after free_used_memory()

client/mysqltest.c:
  move my_end() after free_used_memory()
---
 client/mysqltest.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'client')

diff --git a/client/mysqltest.c b/client/mysqltest.c
index 18d5660d1a7..abacd73d878 100644
--- a/client/mysqltest.c
+++ b/client/mysqltest.c
@@ -538,7 +538,6 @@ static void free_used_memory()
   mysql_server_end();
   if (ps_protocol)
     ps_free_reg();
-  my_end(MY_CHECK_ERROR);
   DBUG_VOID_RETURN;
 }
 
@@ -556,6 +555,7 @@ static void die(const char* fmt, ...)
   }
   va_end(args);
   free_used_memory();
+  my_end(MY_CHECK_ERROR);
   exit(1);
 }
 
@@ -568,6 +568,7 @@ static void abort_not_supported_test()
   if (!silent)
     printf("skipped\n");
   free_used_memory();
+  my_end(MY_CHECK_ERROR);
   exit(2);
 }
 
@@ -3655,6 +3656,7 @@ int main(int argc, char **argv)
   if (!got_end_timer)
     timer_output();				/* No end_timer cmd, end it */
   free_used_memory();
+  my_end(MY_CHECK_ERROR);
   exit(error ? 1 : 0);
   return error ? 1 : 0;				/* Keep compiler happy */
   }
-- 
cgit v1.2.1