diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2012-12-21 10:26:26 +0100 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2012-12-21 10:26:26 +0100 |
| commit | 8aa2a2d637bdefb5f7cb0a70a9a07d23e920f1c5 (patch) | |
| tree | 2ce0ad117025b169098b462ca87fe4baee6b814d /client | |
| parent | 96c373c51a2a6f3d0c2190bbc2f641c455f67319 (diff) | |
| parent | 4a35c6d44b7c400e8b89cdff99a628cc2a903ebd (diff) | |
| download | mariadb-git-8aa2a2d637bdefb5f7cb0a70a9a07d23e920f1c5.tar.gz | |
merge 5.1 => 5.5
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index 22155005112..3d8fe85fb80 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1312,7 +1312,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(); |