bzr push into mysql-5.6 branch (sayantan.dutta:3930 to 3931) Bug#14122156

[sayantan.dutta]

 3931 sayantan.dutta@stripped	2012-06-29
      BUG #14122156 - INNODB.INNODB-WL5522* FAILURE ON PB2 WITH DIFFERENT SYMPTOMS 

    modified:
      mysql-test/mysql-test-run.pl
 3930 Nirbhay Choubey	2012-06-29
      Bug#14136937 SERVER DOESN'T WARN ABOUT
            STARTING WITH --SKIP-SECURE-AUTH
      
      No warning message gets generated at
      server start if it is started with
      secure_auth disabled.
      
      Fixed by adding appropriate logic to
      emit a warning message when server is
      started with --skip-secure-auth.
      
      Note : There is no test case for this
             bug, tested manually.
     @ sql/mysqld.cc
        Bug#14136937 SERVER DOESN'T WARN ABOUT
              STARTING WITH --SKIP-SECURE-AUTH
        
        Log appropriate warning message if
        --skip-secure-auth option is used.

    modified:
      sql/mysqld.cc
      sql/mysqld.h
      sql/sys_vars.cc
=== 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).