From 18e17f134c38c61ba649ae742ee07bdffeed8dea Mon Sep 17 00:00:00 2001
From: Vladislav Vaintroub <wlad@mariadb.com>
Date: Fri, 8 Sep 2017 08:33:41 +0200
Subject: [PATCH] Windows : Fix MTR's misuse of servers --console parameter

---
 extra/mariabackup/xtrabackup.cc |  5 ++---
 mysql-test/mysql-test-run.pl    | 15 ---------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc
index b775a24a659..65aa913cc29 100644
--- a/extra/mariabackup/xtrabackup.cc
+++ b/extra/mariabackup/xtrabackup.cc
@@ -1199,7 +1199,7 @@ static int prepare_export()
       " --defaults-extra-file=./backup-my.cnf --datadir=."
       " --innodb --innodb-fast-shutdown=0"
       " --innodb_purge_rseg_truncate_frequency=1 --innodb-buffer-pool-size=%llu"
-      " --console  --log-error= --bootstrap  < "  BOOTSTRAP_FILENAME IF_WIN("\"",""),
+      " --console  --skip-log-error --bootstrap  < "  BOOTSTRAP_FILENAME IF_WIN("\"",""),
       mariabackup_exe, 
       orig_argv1, (my_defaults_group_suffix?my_defaults_group_suffix:""),
       xtrabackup_use_memory);
@@ -1228,7 +1228,6 @@ static int prepare_export()
     fprintf(stderr,"%s",outline);
 
   err = pclose(outf);
-
 end:
   unlink(BOOTSTRAP_FILENAME);
   return err;
@@ -5028,7 +5027,7 @@ handle_options(int argc, char **argv, char ***argv_client, char ***argv_server)
 	my_sigset(SIGINT, SIG_DFL);
 #endif
 
-	sf_leaking_memory = 0; /* don't report memory leaks on early exist */
+	sf_leaking_memory = 1; /* don't report memory leaks on early exist */
 
 	int i;
 	int ho_error;
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index d81743f3a1e..d760efc3744 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -5055,13 +5055,6 @@ sub mysqld_start ($$) {
 		$path_vardir_trace, $mysqld->name());
   }
 
-  if (IS_WINDOWS)
-  {
-    # Trick the server to send output to stderr, with --console
-    if (!(grep(/^--log-error/, @$args))) {
-      mtr_add_arg($args, "--console");
-    }
-  }
 
   # "Dynamic" version of MYSQLD_CMD is reevaluated with each mysqld_start.
   # Use it to restart the server at testing a failing server start (e.g
@@ -5524,14 +5517,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
-      if (!(grep(/^--server-arg=--log-error/, @$args))) {
-        mtr_add_arg($args, "--server-arg=--console");
-      }
-    }
   }
 
   # ----------------------------------------------------------------------