bzr push into mysql-trunk branch (sayantan.dutta:4576 to 4577) Bug#14635012

[sayantan.dutta]

 4577 sayantan.dutta@stripped	2012-09-27
      Bug #14635012 - ALLOW OPTION TO SUPPRESS --CONSOLE OPTION THAT MTR SENDS TO MYSQLD ON WINDOWS

    modified:
      mysql-test/mysql-test-run.pl
 4576 Venkatesh Duggirala	2012-09-27 [merge]
      Null-merge from 5.6 for BUG#12776842

=== modified file 'mysql-test/mysql-test-run.pl'
--- a/mysql-test/mysql-test-run.pl	2012-09-05 16:09:51 +0000
+++ b/mysql-test/mysql-test-run.pl	2012-09-27 11:28:14 +0000
@@ -5107,6 +5107,7 @@ sub mysqld_arguments ($$$) {
   # override defaults above.
 
   my $found_skip_core= 0;
+  my $found_no_console= 0;
   foreach my $arg ( @$extra_opts )
   {
     # Skip --defaults-file option since it's handled above.
@@ -5117,6 +5118,10 @@ sub mysqld_arguments ($$$) {
     {
       $found_skip_core= 1;
     }
+    elsif ($arg eq "--no-console")
+    {
+        $found_no_console= 1;
+    }
     elsif ($skip_binlog and mtr_match_prefix($arg, "--binlog-format"))
     {
       ; # Dont add --binlog-format when running without binlog
@@ -5137,6 +5142,11 @@ sub mysqld_arguments ($$$) {
     }
   }
   $opt_skip_core = $found_skip_core;
+  if (IS_WINDOWS && !$found_no_console)
+  {
+    # Trick the server to send output to stderr, with --console
+    mtr_add_arg($args, "--console");
+  }
   if ( !$found_skip_core && !$opt_user_args )
   {
     mtr_add_arg($args, "%s", "--core-file");
@@ -5190,12 +5200,6 @@ sub mysqld_start ($$) {
 		$path_vardir_trace, $mysqld->name());
   }
 
-  if (IS_WINDOWS)
-  {
-    # Trick the server to send output to stderr, with --console
-    mtr_add_arg($args, "--console");
-  }
-
   if ( $opt_gdb || $opt_manual_gdb )
   {
     gdb_arguments(\$args, \$exe, $mysqld->name());
@@ -5886,12 +5890,6 @@ sub start_mysqltest ($) {
     my $extra_opts= get_extra_opts($mysqld, $tinfo);
     mysqld_arguments($mysqld_args, $mysqld, $extra_opts);
     mtr_add_arg($args, "--server-arg=%s", $_) for @$mysqld_args;
-
-    if (IS_WINDOWS)
-    {
-      # Trick the server to send output to stderr, with --console
-      mtr_add_arg($args, "--server-arg=--console");
-    }
   }
 
   # ----------------------------------------------------------------------

No bundle (reason: useless for push emails).