From 96c88435144750e647f28edb341a171ae049f1bf Mon Sep 17 00:00:00 2001
From: Alexander Nozdrin <alik@sun.com>
Date: Thu, 10 Sep 2009 11:40:57 +0400
Subject: A patch for Bug#45118 (mysqld.exe crashed in debug mode on Windows in
 dbug.c) -- part 2: a patch for the DBUG subsystem to detect misuse of
 DBUG_ENTER / DBUG_RETURN macros. 5.1 version.

---
 client/mysqltest.cc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'client/mysqltest.cc')

diff --git a/client/mysqltest.cc b/client/mysqltest.cc
index b9535ba6b05..af2749e3191 100644
--- a/client/mysqltest.cc
+++ b/client/mysqltest.cc
@@ -1165,6 +1165,7 @@ void free_used_memory()
     mysql_server_end();
 
   /* Don't use DBUG after mysql_server_end() */
+  DBUG_VIOLATION_HELPER_LEAVE;
   return;
 }
 
@@ -2487,7 +2488,7 @@ void do_source(struct st_command *command)
   }
 
   dynstr_free(&ds_filename);
-  return;
+  DBUG_VOID_RETURN;
 }
 
 
@@ -7507,6 +7508,8 @@ static void init_signal_handling(void)
 #endif
   sigaction(SIGILL, &sa, NULL);
   sigaction(SIGFPE, &sa, NULL);
+
+  DBUG_VOID_RETURN;
 }
 
 #endif /* !__WIN__ */
@@ -8121,6 +8124,8 @@ void do_get_replace_column(struct st_command *command)
   }
   my_free(start, MYF(0));
   command->last_argument= command->end;
+
+  DBUG_VOID_RETURN;
 }
 
 
-- 
cgit v1.2.1