From: sayantan.dutta
Date: June 29 2012 7:54am
Subject: bzr push into mysql-trunk branch (sayantan.dutta:3923 to 3924)
List-Archive: http://lists.mysql.com/commits/144342
Message-Id: <201206290754.q5T7sBE0021710@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3924 sayantan.dutta@stripped	2012-06-29 [merge]
      merge  5.6 => trunk

    modified:
      mysql-test/mysql-test-run.pl
 3923 Tor Didriksen	2012-06-29
      Bug#14255135 WARN IF VARIABLE LENGTH ARRAY IS USED IN THE CODE

    modified:
      cmake/maintainer.cmake
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-06-14 11:56:32 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-06-29 07:50:20 +0000
@@ -4460,7 +4460,7 @@ sub extract_server_log ($$) {
       if ( $line =~ /^CURRENT_TEST:/)
       {
 	@lines= ();
-	$found_test= $line =~ /^CURRENT_TEST: $tname/;
+	$found_test= $line =~ /^CURRENT_TEST: $tname$/;
       }
       else
       {
@@ -4475,7 +4475,7 @@ sub extract_server_log ($$) {
     else
     {
       # Search for beginning of test, until found
-      $found_test= 1 if ($line =~ /^CURRENT_TEST: $tname/);
+      $found_test= 1 if ($line =~ /^CURRENT_TEST: $tname$/);
     }
   }
   $Ferr = undef; # Close error log file

No bundle (reason: useless for push emails).