summaryrefslogtreecommitdiff
path: root/sql/sql_test.cc
diff options
context:
space:
mode:
authorunknown <thek@adventure.(none)>2007-05-24 13:11:45 +0200
committerunknown <thek@adventure.(none)>2007-05-24 13:11:45 +0200
commit1632586e20205ad1ed6ac5b865b6164a7be333ee (patch)
tree48984a2fa81e628d12315095c64ea2f88b14d5e3 /sql/sql_test.cc
parentc3c64f1a0a63d25bf158c741dcb8d7e436a7247a (diff)
downloadmariadb-git-1632586e20205ad1ed6ac5b865b6164a7be333ee.tar.gz
Bug#28644 Memory status report confused with memory leak
This patch removes a false memory leak error report from the test suite. There is a test case that puposely provokes a SAFEMALLOC leak report, even though there is no actual leak. mysql-test/lib/mtr_report.pl: There is a test case that purposely provokes a SAFEMALLOC leak report, even though there is no actual leak. We need to detect this, and ignore the warning in that case. sql/sql_test.cc: Added tags to surround memory dump status report to help the test suite to determine that this isn't a memory leak
Diffstat (limited to 'sql/sql_test.cc')
-rw-r--r--sql/sql_test.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_test.cc b/sql/sql_test.cc
index d6afc888be2..e73fd03426a 100644
--- a/sql/sql_test.cc
+++ b/sql/sql_test.cc
@@ -406,7 +406,9 @@ Next alarm time: %lu\n",
if (thd)
thd->proc_info="malloc";
my_checkmalloc();
+ fprintf(stdout,"\nBegin safemalloc memory dump:\n"); // tag needed for test suite
TERMINATE(stdout); // Write malloc information
+ fprintf(stdout,"\nEnd safemalloc memory dump.\n");
#ifdef HAVE_MALLINFO
struct mallinfo info= mallinfo();