database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fix mysql-test-run on windows:

Browse Source 
Make it not to add '--console' when '--log-error' option is present
- Review feedback
This commit is contained in:
Sergey Petrunya
2009-09-18 04:55:27 +04:00
parent f974f10cf1
commit bb2b859225
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/mysql-test-run.pl
View File

@ -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 ($) {
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");
} }
} }