bzr push into mysql-5.5 branch (bjorn.munch:3327 to 3328)

[Bjorn Munch]

 3328 Bjorn Munch	2011-02-16
      Removed unused code accidentally pushed with Bug @58122

    modified:
      mysql-test/mysql-test-run.pl
 3327 Dmitry Lenev	2011-02-15 [merge]
      Merged recent changes from mysql-5.5 tree with
      fix for bug @59888.

    removed:
      mysql-test/suite/rpl/t/rpl_failed_optimize-master.opt
    modified:
      mysql-test/extra/rpl_tests/rpl_failed_optimize.test
      mysql-test/suite/rpl/r/rpl_failed_optimize.result
      mysql-test/suite/rpl/r/rpl_read_only.result
      mysql-test/suite/rpl/t/disabled.def
      mysql-test/suite/rpl/t/rpl_read_only.test
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-02-09 15:25:34 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-02-16 11:24:17 +0000
@@ -1560,12 +1560,6 @@ sub command_line_setup {
     $debug_d= "d,query,info,error,enter,exit";
   }
 
-  if ($opt_debug && $opt_debug ne "1")
-  {
-    $debug_d= "d,$opt_debug";
-    $debug_d= "d,query,info,error,enter,exit" if $opt_debug eq "std";
-  }
-
   mtr_report("Checking supported features...");
 
   check_ndbcluster_support(\%mysqld_variables);

No bundle (reason: useless for push emails).