bzr push into mysql-trunk branch (bjorn.munch:3652 to 3653)

[Bjorn Munch]

 3653 Bjorn Munch	2011-02-16 [merge]
      Removed unused code accidentally pushed with Bug @58122

    modified:
      mysql-test/mysql-test-run.pl
 3652 Dmitry Lenev	2011-02-15 [merge]
      Merged recent changed from mysql-trunk with fix for
      bug @59888.

    modified:
      client/mysql.cc
      mysql-test/r/select_safe.result
      mysql-test/suite/sys_vars/r/max_join_size_func.result
      mysql-test/suite/sys_vars/r/sql_big_selects_func.result
      sql/share/errmsg-utf8.txt
=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2011-02-09 15:35:49 +0000
+++ b/mysql-test/mysql-test-run.pl	2011-02-16 11:25:27 +0000
@@ -1562,12 +1562,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).