bzr commit into mysql-5.1-mtr branch (bjorn.bunch:2919) Bug#55503

[Bjorn Munch]

#At file:///home/bm136801/my/leak-51/ based on revid:bjorn.munch@stripped

 2919 Bjorn Munch	2010-07-23
      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

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2010-06-15 11:37:53 +0000
+++ b/mysql-test/mysql-test-run.pl	2010-07-23 12:53:09 +0000
@@ -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;
     }


Attachment: [text/bzr-bundle] bzr/[e-mail]