bzr push into mysql-5.6 branch (bjorn.munch:4046 to 4047) Bug#14336086

[Bjorn Munch]

 4047 Bjorn Munch	2012-07-18
      Bug #14336086 DO NOT ERROR OUT IF --DEBUG-SERVER OPTION IS PASSED TO NON...
        Issue only a warning for --debug-server, but still err out for --debug

    modified:
      mysql-test/mysql-test-run.pl
 4046 Manish Kumar	2012-07-18
      BUG#14237992 - RPL_SEMI_SYNC FAILURES ON TRUNK AS PART OF WL#5223
            
      Problem: The rpl.rpl_semi_sync test fails sporadically and more 
               frequently after wl#5223. The problem is that the slave is 
               unable to get in sync with the master on slow platforms in the 
               default duration of the timeout. So the wait_for_status_var fails.
            
      Fix: The problem is fixed by hardening the test case with new checks 
           and also increase the timeout duration during the call of the 
           .inc file in the test, in order to let the slave catch up with the 
           master.

    modified:
      mysql-test/suite/rpl/t/rpl_semi_sync.test
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-06-29 07:50:20 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-07-18 10:48:34 +0000
@@ -2792,9 +2792,13 @@ sub check_debug_support ($) {
     #mtr_report(" - binaries are not debug compiled");
     $debug_compiled_binaries= 0;
 
+    if ( $opt_debug )
+    {
+      mtr_error("Can't use --debug, binary does not support it");
+    }
     if ( $opt_debug_server )
     {
-      mtr_error("Can't use --debug[-server], binary does not support it");
+      mtr_warning("Ignoring --debug-server, binary does not support it");
     }
     return;
   }

No bundle (reason: useless for push emails).