diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-08 08:33:41 +0200 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-09-08 08:33:41 +0200 |
| commit | 18e17f134c38c61ba649ae742ee07bdffeed8dea (patch) | |
| tree | 9a53f133c2ee8c5c248fc29f7548c484daa70f85 /mysql-test | |
| parent | d471469bd2a6de0d8d68343bcf374a382c5bfd92 (diff) | |
| download | mariadb-git-18e17f134c38c61ba649ae742ee07bdffeed8dea.tar.gz | |
Windows : Fix MTR's misuse of servers --console parameter
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d81743f3a1e..d760efc3744 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -5055,13 +5055,6 @@ sub mysqld_start ($$) { $path_vardir_trace, $mysqld->name()); } - if (IS_WINDOWS) - { - # Trick the server to send output to stderr, with --console - if (!(grep(/^--log-error/, @$args))) { - mtr_add_arg($args, "--console"); - } - } # "Dynamic" version of MYSQLD_CMD is reevaluated with each mysqld_start. # Use it to restart the server at testing a failing server start (e.g @@ -5524,14 +5517,6 @@ sub start_mysqltest ($) { my $extra_opts= get_extra_opts($mysqld, $tinfo); mysqld_arguments($mysqld_args, $mysqld, $extra_opts); mtr_add_arg($args, "--server-arg=%s", $_) for @$mysqld_args; - - if (IS_WINDOWS) - { - # Trick the server to send output to stderr, with --console - if (!(grep(/^--server-arg=--log-error/, @$args))) { - mtr_add_arg($args, "--server-arg=--console"); - } - } } # ---------------------------------------------------------------------- |