1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge adventure.(none):/home/thek/Development/cpp/bug28644/my50-bug28644

Browse Source 
into  adventure.(none):/home/thek/Development/cpp/bug28644/my51-bug28644


mysql-test/lib/mtr_report.pl:
  Auto merged
sql/sql_test.cc:
  Auto merged
This commit is contained in:
unknown 2007-05-24 13:54:32 +02:00
commit 404f0e66b2
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mysql-test/lib/mtr_report.pl
View File

@ -278,8 +278,19 @@ sub mtr_report_stats ($) {
mtr_warning("can't read $errlog"); mtr_warning("can't read $errlog");
next; next;
} }
my $leak_reports_expected= undef;
while ( <ERR> ) while ( <ERR> )
{ {
# 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.
if (/Begin safemalloc memory dump:/) {
$leak_reports_expected= 1;
} elsif (/End safemalloc memory dump./) {
$leak_reports_expected= undef;
}
# Skip some non fatal warnings from the log files # Skip some non fatal warnings from the log files
if ( /Warning:\s+Table:.* on (delete|rename)/ or if ( /Warning:\s+Table:.* on (delete|rename)/ or
/Warning:\s+Setting lower_case_table_names=2/ or /Warning:\s+Setting lower_case_table_names=2/ or
@ -290,6 +301,9 @@ sub mtr_report_stats ($) {
} }
if ( /$pattern/ ) if ( /$pattern/ )
{ {
if ($leak_reports_expected) {
next;
}
$found_problems= 1; $found_problems= 1;
print WARN $_; print WARN $_;
} }

2
sql/sql_test.cc
View File

@ -508,7 +508,9 @@ Next alarm time: %lu\n",
display_table_locks(); display_table_locks();
fflush(stdout); fflush(stdout);
my_checkmalloc(); my_checkmalloc();
fprintf(stdout,"\nBegin safemalloc memory dump:\n"); // tag needed for test suite
TERMINATE(stdout); // Write malloc information TERMINATE(stdout); // Write malloc information
fprintf(stdout,"\nEnd safemalloc memory dump.\n");
#ifdef HAVE_MALLINFO #ifdef HAVE_MALLINFO
struct mallinfo info= mallinfo(); struct mallinfo info= mallinfo();