From bb2b859225daacbbe4b41b9d5e358ec183c185df Mon Sep 17 00:00:00 2001 From: Sergey Petrunya Date: Fri, 18 Sep 2009 04:55:27 +0400 Subject: Fix mysql-test-run on windows: Make it not to add '--console' when '--log-error' option is present - Review feedback --- mysql-test/mysql-test-run.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index db7cbe37402..c49ae47aca4 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4433,7 +4433,7 @@ sub mysqld_start ($$) { if (IS_WINDOWS) { # Trick the server to send output to stderr, with --console - if (!(join(' ', @$args) =~ /--log-error/)) { + if (!(grep(/^--log-error/, @$args))) { mtr_add_arg($args, "--console"); } } @@ -5058,7 +5058,7 @@ sub start_mysqltest ($) { if (IS_WINDOWS) { # Trick the server to send output to stderr, with --console - if (!(join(' ', @$args) =~ /--log-error/)) { + if (!(grep(/^--server-arg=--log-error/, @$args))) { mtr_add_arg($args, "--server-arg=--console"); } } -- cgit v1.2.1