From: Bjorn Munch
Date: April 27 2011 1:29pm
Subject: bzr commit into mysql-5.5-mtr branch (bjorn.munch:3207) Bug#11765749
List-Archive: http://lists.mysql.com/commits/136207
X-Bug: 11765749
Message-Id: <201104271329.p3RDT9Kw005245@khepri15.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0667711871=="

--===============0667711871==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

 3207 Bjorn Munch	2011-04-27
      Bug #11765749 58745: MTR SPENDS LONG TIME CHECKING FOR WARNINGS
      Added code to look for repetitions and only repeat warnings once
      Reduced time spent in check-warnings by almost 20% for full test suite

    modified:
      mysql-test/mysql-test-run.pl
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-04-27 07:45:23 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-04-27 13:26:37 +0000
@@ -4116,6 +4116,9 @@ sub extract_warning_lines ($$) {
     );
   my $skip_valgrind= 0;
 
+  my $last_pat= "";
+  my $num_rep= 0;
+
   foreach my $line ( @lines )
   {
     if ($opt_valgrind_mysqld) {
@@ -4130,11 +4133,29 @@ sub extract_warning_lines ($$) {
     {
       if ( $line =~ /$pat/ )
       {
-	print $Fwarn $line;
+	# Remove initial timestamp and look for consecutive identical lines
+	my $line_pat= $line;
+	$line_pat =~ s/^[0-9: ]*//;
+	if ($line_pat eq $last_pat) {
+	  $num_rep++;
+	} else {
+	  $last_pat= $line_pat;
+	  # Previous line had been repeated, report that first
+	  if ($num_rep) {
+	    print $Fwarn ".... repeated $num_rep times: $line_pat";
+	    $num_rep= 0;
+	  }
+	  print $Fwarn $line;
+	}
 	last;
       }
     }
   }
+  # Catch the case of last warning being repeated
+  if ($num_rep) {
+    print $Fwarn ".... repeated $num_rep times: $last_pat";
+  }
+
   $Fwarn = undef; # Close file
 
 }


--===============0667711871==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/bjorn.munch@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: bjorn.munch@stripped
# target_branch: file:///home/bm136801/my/repwrn-55/
# testament_sha1: 93b0f2c60b31b087d150fc973d61e07dedb40fce
# timestamp: 2011-04-27 15:29:09 +0200
# base_revision_id: bjorn.munch@stripped\
#   9awqojg43isixii6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWT8uQYIAAftfgEAwXn///3/v
3Iu////7UATse06Ku5rstHqlzISmqaU2psRDIxPSbKPUGI0DTQDQAGgzUAlCJPUzEm1MknqeU8mo
2U00AMnqAxAAAAamjJqp5TynqBtT1PSZH6o0bUaNAMRkAaaGQAMkRJ/qBQ0PNQgaME0NAaNNNNAx
MCZGgSSAkxoQ1DAahPVMj2lP1Rpo9CAAD1AZqVR9nxmt/iR8/rrSPpM6Wcz3LJjLhcjl7n4iY557
c/fVGApM92paJ6Gk7ANdxEQBMIFb9gY8qWVZfxFVGnOEbjZWhj4SBEyOIZBKigqDdOjoPBkNhURu
Rem3f2a0xjvQj1c1VFLYRn8VTJS3LdISK8WRErrMmZLiiRXpEaRzXRov9UzysvugO2UxIyicnMXn
dn658u3n21LzluDRelA7mELC8whWVTQXa1NZFy6miZRi3DXC+M6GDXJHE0OxIYhailu9IoJeHs6e
EKS3RA5+rxe5YjJEOldd48R2YA6t5BnrMM8hAc+PpPcKaK9PfMRZqNp81ojMpLw2mKDJitrvi4Sp
62FydBU/r2TiPqOIeXLvU1S7ricss5i8soZvqJXOEV0BjZGewTA9hRNhfMMxfecRcXXWv2iqA1ZW
UgZgOps2d+Ae+RSVT1nIKYwPThHyBoDe27qzzg1aGuTsC0/2HvOovqry0g83uyCmfrZ4YRwr/hbr
fZm0kR0TWpY4SWYzvdpy5Uw4Qef7caqQZhOojgwoMT0kAbTHaQpRbtJJw02Kh2vVmmPmQrWxi/Au
YWCllZhOFDRHkVg1icZK6FtDQrINNHHKSStBtYSPagUBUK1wP1t8rjkFGIKyAJYV5nNFBnxXrzMU
RwJMjHtFN5ff3S+M2d6NSbJRlc7OyoieoXnRR7wRQZq7+Sh401+KSWa0AhJLWZt2443mL998OLAb
WDDHvjySRCyqLo8trg5vIYXyKnEJIdAmPmQzPMmRkR25wPYQ5rNMjN8JDhE9Rovcw38QapJsjYtZ
FQ1yXuJYYSR6zKg2TApz6NGuDkiH2JGLoogxMY9enR2vrkopfOOSXb+1ZTjsITmV9gfW+RhfxbX9
JftyNUCdqh69XA8vpWSNko02UVnTCCGOmCC8OWxKsBmOXPp0YLo6bV4MuJXe5xwsdo7y7enCCT9e
fTO779htaSYYjWjZZBRksuovz2rFisTCm3KW44ejL0ukWExUSuuPAKrETjANO2YQLcFeoshjvuRE
wDJ25mpy8la6yXjA1noC41qQon5h2IMKXsRvXjtxn0BZ8FGDvDfbHi00XvOIazErF6e5Itka1tDr
sb0LLWF4RcGv8AwrSGo3OMUmilcjGiCMxTbYIlBRSd8yQoKKGdVHOCsMahR2kijf2t3cVhgsGax1
GSIJxnGKmfRkhiYcxgIMKBSxs8IGGElEMpLC8DTp0lkcBCHgComQP10Y84qK15JFgOVoLgPWylbj
BDcFoeXbWZZIJEESqduTWav5K641N3jg8EVm1orE+MXNEEhmDjJGcmMmPClVoifnmAqUkQkMMz7/
WHTlR2wGFvLXcjZEGLM09WOhFckwFrTv7t6z27Qt03tcooKTBSog6lyYmVGbGrgcwyDMHcMGH0ew
XV33qMKo+2FkagtIXUhQJgxNyk80HJ3mIpeaa9vFIld5yssfmVyOQm7BPF9yw6GxCmRMqsCY5RUM
Olhxt4C8JBsGk6JCyYnePv/xdyRThQkD8uQYIA==


--===============0667711871==--