summaryrefslogtreecommitdiff
path: root/mysql-test/lib
diff options
context:
space:
mode:
authorunknown <kostja@vajra.(none)>2007-05-24 19:34:14 +0400
committerunknown <kostja@vajra.(none)>2007-05-24 19:34:14 +0400
commitdafe92cb024d0f4710897d9770e5f449f86c0773 (patch)
treefcdcafa8ae22694ad6f37c0e0ec20f4fe015f220 /mysql-test/lib
parent59ba51f963327d652616eaf36184c8991aa26ab6 (diff)
parentb85200bafe0b2a996ad9c47d1ed10f032f1da9a9 (diff)
downloadmariadb-git-dafe92cb024d0f4710897d9770e5f449f86c0773.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into vajra.(none):/opt/local/work/mysql-5.1-runtime include/my_global.h: Auto merged mysql-test/include/mix1.inc: Auto merged mysql-test/r/innodb_mysql.result: Auto merged mysql-test/r/ps_2myisam.result: Auto merged mysql-test/r/ps_3innodb.result: Auto merged mysql-test/r/ps_4heap.result: Auto merged mysql-test/r/ps_5merge.result: Auto merged mysql-test/r/ps_7ndb.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/t/disabled.def: Auto merged mysql-test/t/type_date.test: Auto merged sql/filesort.cc: Auto merged sql/handler.cc: Auto merged sql/item_func.cc: Auto merged sql/item_func.h: Auto merged sql/mysql_priv.h: Auto merged sql/sql_base.cc: Auto merged sql/sql_select.cc: Auto merged sql/sql_table.cc: Auto merged
Diffstat (limited to 'mysql-test/lib')
-rw-r--r--mysql-test/lib/mtr_report.pl14
1 files changed, 14 insertions, 0 deletions
diff --git a/mysql-test/lib/mtr_report.pl b/mysql-test/lib/mtr_report.pl
index ce206a35727..d3b38573ae2 100644
--- a/mysql-test/lib/mtr_report.pl
+++ b/mysql-test/lib/mtr_report.pl
@@ -278,8 +278,19 @@ sub mtr_report_stats ($) {
mtr_warning("can't read $errlog");
next;
}
+ my $leak_reports_expected= undef;
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
if ( /Warning:\s+Table:.* on (delete|rename)/ or
/Warning:\s+Setting lower_case_table_names=2/ or
@@ -290,6 +301,9 @@ sub mtr_report_stats ($) {
}
if ( /$pattern/ )
{
+ if ($leak_reports_expected) {
+ next;
+ }
$found_problems= 1;
print WARN $_;
}