From 858d260bd3d7037c920a50c9ea568544058ced7a Mon Sep 17 00:00:00 2001
From: Bjorn Munch <Bjorn.Munch@sun.com>
Date: Mon, 16 Nov 2009 11:18:16 +0100
Subject: [PATCH] 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/ )