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

--===============0573502796==
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
      Sorry, first commit was buggy

    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:56:38 +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
 
 }


--===============0573502796==
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: 9fd4773d75294fd47f871636f904d3f1e4c5281c
# timestamp: 2011-04-27 15:57:15 +0200
# base_revision_id: bjorn.munch@stripped\
#   9awqojg43isixii6
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWcJ5/SYAAgDfgEAwXn///3/v
3Iu////7UATvXNrr13PZ1697ePFPY8JRBCNNNKP1T8qfqbIap4p6TT1MTJ6END01A9NR6PSgEqaT
KYNNTAoNpGhk0AAAAAAAA0KbQpptU9Mmpo2oegg0bUaAAAABoAEikank0mmim2qZoR+qep+qADRo
yA0AAAAJJCaAJlHoU8FPKZoEyaPQmhoDRoGgNNL45HCJV/D+rvaUqb1R+PKRNXdsMRivY+50ZkOz
LVl2F8R3V1Pv3mlkhJjQZR4wMmG4e0gdmZcR+bJJZWfiIMpSez8aVFVLlw2kj4RaXNoe2yAcpXC9
7NsOrR15KJXGtTZRlxZ9KDBGyHxiRaU3PfIYg9wvCN8V6GVa3CDmrYYsdrIJm2nD+sy5jAlMKArV
KtDEoxzX3V4bmB5apSWjWIEwbDJDbHAw2Np2Df2p2+zdGfFcfsRnpvB1EbioWSBRdyUnuEoJLlSI
SCJ1dk9bpIMDwOXp3NYgjZzmkGb5R4joIhDcUZFOc1f6mojLzimRXh5YiMpolnETK2K2TkMVsCtK
OFdDmzikcVK6RjMLpI5RroRpQis1lc2u0feswy+ITx0ayf1ljCIYwYui69yRAsgDjaW7dTU/IKTs
4N7PHFizXQtFvu5ugf2Jo0QUFEYQJOoR0fKF6ND7ow23MhrzAN3GYrkwvHXAxMP8IW6jT4MuETz3
ZKcBIX+BPXdfciqIxjSmyy9EI5vE5tYyOihJSwHn9iKxVtEiW1BIgqBCR4MpavNLt1VLBg24hKKd
MQZUra6YrjiNa0mmIIqi+tLtiSToXpNNLB4wGkuMWy4y2U5oQnVkDZOgahGrUUOAcp1ajc7EeOJR
d5w4r4WGSypqiwxR6fUiFt6FVRTt0Fxi798G7xf90gTvt8Gtf4KRstX7W27YY4fGZ3faxq+ZeC4c
WSlEVFVVrRPXiaWc7Q0nGbHcR0zO4OpImnK6CqQIdJdbSSPNlKO9KbnFtwLLHIjczQZKHVzTjzr6
CU5QwnOKzhMx/+F1FfoEg+Euo1nk0xMbZY3DxYKMennwrgkV8yQ+c4orZIZ1NWW3VHCj0zjMDkun
J+6HOyjHX4i9Nmzu1nkzyMeCds1Pcwl0EYqkQwOkozKEXBKEIUVqGi8FEaqaxe9bbGPL1jV5GPJB
TI56mPwxVYBSRW6xNokgIB0V2eh0vZSJzaRgwsZGGNyPUgTGwwCzzcmOjIKcRDFdOOq+kyoZlX0t
NgZkH8MDXuL+DAs4UYCmFuixGoUS4HOzs1fX3qp1O4KXtkN04AwGVRFIdgboF1lrElq7c+GXEFN1
Ywcob2euL2lRgebwZC82caRTIZFmDVQ3CtOQLAkcGTrRfRIdz2xiJ2691wqLM6t3BYakiaXArqM2
NSMi0UykJEjvpG/o2vwZK+9Xt2wuaRWoGkZN1XNIZIO0OwTFFihNQq0jIKiTa1pQWOOyd3PCcghS
nIxJvs6GMmKF3pFIOVgL2aSCzWUuLkNpW5UX8La6SDMVozTh0E7dn2KUjN9wgHjRQ4XFYEEllWi9
KiVPe8qiyN6sU07WkQWuMe6RwHN4SIXUGZ8mjYjHoRVLuX4qXITvASNWxi4kmw4QfVUi50EUMVgx
ISvutUXMzDnSs/Ayg85RPQ96OMwuIRg4LqL72HDcwnEls1NcgWELbIWBKDErlF5ecmh+silrmXVr
SI4OApKnzrUK0XvVuJi8KvFjE22TVA8IV9xLO8yQVcagYQkkVkNjgC2hl/xdyRThQkMJ5/SY


--===============0573502796==--