merge 5.1 => 5.5

a8bcaf49 · Tor Didriksen · 8b1d1cf5 · 0b83ecb6 · a8bcaf49
Commit a8bcaf49 authored Dec 21, 2012 by Tor Didriksen
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

client/mysqltest.cc client/mysqltest.cc +1 -1

No files found.
--- 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();