From 6edaebbf57bb2722b925883e705c167b09beceef Mon Sep 17 00:00:00 2001 From: Bjorn Munch Date: Mon, 16 Nov 2009 11:18:16 +0100 Subject: [PATCH 1/2] Bug #48795 Valgrind summary from tests where server has been restarted cause test failure Seen in a few tests after 43418 Add code in extract_warning_lines() to skip this part --- mysql-test/mysql-test-run.pl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 4ac3beff0a6..4501afa8ee7 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3700,9 +3700,17 @@ sub extract_warning_lines ($$) { qr/Attempting backtrace/, qr/Assertion .* failed/, ); + my $skip_valgrind= 0; foreach my $line ( @lines ) { + if ($opt_valgrind_mysqld) { + # Skip valgrind summary from tests where server has been restarted + # Should this contain memory leaks, the final report will find it + $skip_valgrind= 1 if $line =~ /^==\d+== ERROR SUMMARY:/; + $skip_valgrind= 0 unless $line =~ /^==\d+==/; + next if $skip_valgrind; + } foreach my $pat ( @patterns ) { if ( $line =~ /$pat/ ) From f57dda3babf5b8e821b09f34f5146080ff32f9eb Mon Sep 17 00:00:00 2001 From: Bjorn Munch Date: Mon, 16 Nov 2009 14:46:33 +0100 Subject: [PATCH 2/2] minor fix of a valgrind suppress pattern --- mysql-test/include/mtr_warnings.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index 0176c1800e8..7502470979e 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -181,7 +181,7 @@ INSERT INTO global_suppressions VALUES ("==[0-9]*== Using"), ("==[0-9]*== For more details"), /* This comes with innodb plugin tests */ - ("==[0-9]*== Warning: set address range perms: large range .* .defined."), + ("==[0-9]*== Warning: set address range perms: large range"), ("THE_LAST_SUPPRESSION")||