From 50cdef087d4a9787ae66ebc672b29e9c7ccd3c42 Mon Sep 17 00:00:00 2001
From: Bjorn Munch <bjorn.bunch@oracle.com>
Date: Fri, 23 Jul 2010 14:53:09 +0200
Subject: [PATCH] Bug #55503 MTR fails to filter LEAK SUMMARY from valgrind
 report of restarted servers Was not covered by "skip" pattern Replace with a
 more generic pattern for SUMMARY

---
 mysql-test/mysql-test-run.pl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index fce8ce5ec1c..93f9b671f5a 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -3791,7 +3791,8 @@ sub extract_warning_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:/;
+      # Use a generic pattern for summaries
+      $skip_valgrind= 1 if $line =~ /^==\d+== [A-Z ]+ SUMMARY:/;
       $skip_valgrind= 0 unless $line =~ /^==\d+==/;
       next if $skip_valgrind;
     }