summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Petrunya <psergey@askmonty.org>2009-09-18 04:55:27 +0400
committerSergey Petrunya <psergey@askmonty.org>2009-09-18 04:55:27 +0400
commitbb2b859225daacbbe4b41b9d5e358ec183c185df (patch)
treeff3a722113329fd615cc13a0be5cc2cf545ad006
parentf974f10cf1e790a162a46d662061fd08b050c648 (diff)
downloadmariadb-git-bb2b859225daacbbe4b41b9d5e358ec183c185df.tar.gz
Fix mysql-test-run on windows:
Make it not to add '--console' when '--log-error' option is present - Review feedback
-rwxr-xr-xmysql-test/mysql-test-run.pl4
1 files 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");
}
}