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

--===============1723832239==
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

 3209 Bjorn Munch	2011-04-29
      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-29 13:28:52 +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 {
+	  # Previous line had been repeated, report that first
+	  if ($num_rep) {
+	    print $Fwarn ".... repeated $num_rep times: $last_pat";
+	    $num_rep= 0;
+	  }
+	  $last_pat= $line_pat;
+	  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
 
 }


--===============1723832239==
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: fc26e9ed97ecc9b35fdcdd426500097fd952e20f
# timestamp: 2011-04-29 15:29:21 +0200
# base_revision_id: bjorn.munch@stripped\
#   rvehp20e7fmz4rs3
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVPiNuwAAgRfgEAwXn///3/v
3Iu////7UATjLznQudcLHgc3eEpqCnqankmmmmFPaGgo8UAaZMg0aBpmow9KAlEENNGpgTUZT1P1
GmoaaABoNDIADQ0BpNTaKY1T8ijQbUbU9NQabKaAAAAA0ADaihPU2kynpRnkhpoNBNBowAEYAATA
SUjETAhGhtTTRo0ZAAGgBoA0AG+QaAzU7j+rteYUdqaOXQWXrbjqFkoy9MJyo5rOLN9bQwqJ38Ol
aYwjfYPEPECZC1bSB+MTaz+boykn4CDupr+fqvISaaY6y1GQsMH34vzWCCMcoxd1y5dXNVftwOmK
l3cmHQoPBIv4wwSg/fGoOawUiNsVLsiWNDmsSNaSQxiZm80f0sHrB0ZV0IxBaahAWT1NtrqwXC1i
dMpIgSxiURBcbgQsCmQauGZdi5b3Ad4xTvXXTesaWYxQJNVvZ8RyCziWLQSJxLjxZl1s77g4Dck9
bSbCJNhKtJhBQNEcJWfeVuAex6kJE2GFENnYaIzSPejERpy3JB8UCmn6a7qmCTDonSntIapttWis
dwiTji5Uoj3KHFUccNLTKQ8R1PMY6GCFCRwTTDeRyRvQVwyoRqBZZPbQFAgmrqy5YowVx85kV9xy
PlvLXSSfqw97YLJZGFAGRgjl8EjZVMNW9Bd8ytHN6j/JvEqNLSmIl7ykzCvevJ8+Dr6pRwnsrvFN
HUNzdsICRsYURvXUa8cU4KTe3FRhXBWpWuxrCD6sbSaclJHxyjU4wSg/olMVHvGwqZlSJU92tpF1
LVlHEsgug11IqiSSGlkHPXkga6u2r7SwfMKwqJHuFCjIQNFvUk5hDJSMNA0BqKpsZn4lWxIL3QSb
OKVrPS9ClZn2bGYrokkyOjQTOXd3WP34R6msNtr73vj3ondWvzXX2Snl4XYba3HEtyxZKsLMmSSx
s3myPEGrsDDDhMT9bnSI+NTViVwNxFemQdCb0qP4UfAKy0o33Mz9Dwdb5uf0rj5yQ95wDclw9QUn
sE7ded8CxkMekbOu09pbT6jOMc6xc1BHvq0UuYiDudEIseZCKj1KBTlrt25cNdCPSHENcjGnH+I6
ZTzbRk2ikqw4tzucu3SY8E29HrZLsmXMl5Wba43arlY2QThdig8ubw30o7EZ5N/rQJF2leDXHUlr
coKsephnJmHGRijBAmbv3YTy6NRsWZEIjvMUzwaNhqrhgulxxUapGumgstccx40tTz7aWNkJeX0M
BWwrWiRtlWKqUPLDoM5jJsf8poJX5Gl01qC2niceAXQK89LB1KyZ+XFaCXTnYGG5M68yIphL1syz
fwJF8UzypXAuC0pmRLRqCkHQBVjRXlSGUM2nOQ1GVgZ5FPeKLL6FajCh5wcpiyzGMGNQjegoL+Aq
KtJtrAYiusrZrz1MClHV9Mp2kqYEygl+UwSsiN0eS+mTkQZjKBy9n5d2mydSpEF92U2qzy2q6onw
CoScqSMSkMymLqsTYj9n1lWRhZjQEoKUUJ3sRnD05fiqKJp2/CdLeVCwtMWJwMcETCrCIR6mxyKM
2QWooJxqWBOW3Ln6FguTtbBMOSaOpY0lWCMKMWS2QvKlskgsE727lWW7cErL2WKKgpWCjydttiTM
VGMoVoNYMQYxDkMGDrXMCyF96jBVHSnklcEw2ids4RAwigT9sTTKNmC+PSz41zX0h9OAkKHyaZrb
FgZdLW+JXaMppJUSHNFoT30OKdcQzCZ0pyBkbgVoyf4u5IpwoSCnxG3Y


--===============1723832239==--