Commit 3878ce12 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
parent 2f93e7cd
...@@ -4433,8 +4433,10 @@ sub mysqld_start ($$) { ...@@ -4433,8 +4433,10 @@ 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/)) {
mtr_add_arg($args, "--console"); mtr_add_arg($args, "--console");
} }
}
if ( $opt_gdb || $opt_manual_gdb ) if ( $opt_gdb || $opt_manual_gdb )
{ {
...@@ -5056,9 +5058,11 @@ sub start_mysqltest ($) { ...@@ -5056,9 +5058,11 @@ 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/)) {
mtr_add_arg($args, "--server-arg=--console"); mtr_add_arg($args, "--server-arg=--console");
} }
} }
}
foreach my $arg ( @opt_extra_mysqltest_opt ) foreach my $arg ( @opt_extra_mysqltest_opt )
{ {
......
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