Commit 4a35c6d4 authored by Tor Didriksen's avatar Tor Didriksen

Bug#16027468 ADDRESSSANITIZER BUG IN MYSQLTEST

DBUG_ENTER and DBUG_LEAVE must *always* match,
otherwise all subsequent DBUG_ENTER calls will 
be poking into undefined stack frames.
parent 98aaf18b
...@@ -1168,7 +1168,7 @@ void close_files() ...@@ -1168,7 +1168,7 @@ void close_files()
void free_used_memory() void free_used_memory()
{ {
uint i; uint i;
DBUG_ENTER("free_used_memory"); // Do not use DBUG_ENTER("free_used_memory"); here, see below.
if (connections) if (connections)
close_connections(); close_connections();
...@@ -1206,7 +1206,6 @@ void free_used_memory() ...@@ -1206,7 +1206,6 @@ void free_used_memory()
mysql_server_end(); mysql_server_end();
/* Don't use DBUG after mysql_server_end() */ /* Don't use DBUG after mysql_server_end() */
DBUG_VIOLATION_HELPER_LEAVE;
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment