diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2012-12-20 10:56:09 +0100 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2012-12-20 10:56:09 +0100 |
| commit | 4a35c6d44b7c400e8b89cdff99a628cc2a903ebd (patch) | |
| tree | a9ff2b2dd854316567787c8b0158a9ecde3d4907 | |
| parent | 98aaf18bc7ff64cbb616b4ce94998218704112b6 (diff) | |
| download | mariadb-git-4a35c6d44b7c400e8b89cdff99a628cc2a903ebd.tar.gz | |
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.
| -rw-r--r-- | client/mysqltest.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 89fcb56825e..23978579cdb 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1168,7 +1168,7 @@ void close_files() void free_used_memory() { uint i; - DBUG_ENTER("free_used_memory"); + // Do not use DBUG_ENTER("free_used_memory"); here, see below. if (connections) close_connections(); @@ -1206,7 +1206,6 @@ void free_used_memory() mysql_server_end(); /* Don't use DBUG after mysql_server_end() */ - DBUG_VIOLATION_HELPER_LEAVE; return; } |