Commit d62f6280 authored by Sergey Petrunya's avatar Sergey Petrunya

Fix mysql-test-run on windows:

Make it not to add '--console' when '--log-error' option is present
- Review feedback
parent 2b6e8df5
...@@ -4433,7 +4433,7 @@ sub mysqld_start ($$) { ...@@ -4433,7 +4433,7 @@ sub mysqld_start ($$) {
if (IS_WINDOWS) if (IS_WINDOWS)
{ {
# Trick the server to send output to stderr, with --console # 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"); mtr_add_arg($args, "--console");
} }
} }
...@@ -5058,7 +5058,7 @@ sub start_mysqltest ($) { ...@@ -5058,7 +5058,7 @@ sub start_mysqltest ($) {
if (IS_WINDOWS) if (IS_WINDOWS)
{ {
# Trick the server to send output to stderr, with --console # 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"); mtr_add_arg($args, "--server-arg=--console");
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment