diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-04-05 13:17:43 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-04-07 09:55:54 +0200 |
| commit | 84d9d286cff93e2f637ac1591e991bbc5b03285a (patch) | |
| tree | bd67bb27005d542a51530b3d6993ab74264a73e3 /mysql-test/lib | |
| parent | cd79be82d1d2c17d9f43f993b13412a2172032c4 (diff) | |
| download | mariadb-git-84d9d286cff93e2f637ac1591e991bbc5b03285a.tar.gz | |
use log-error in mtr, don't let mysqld to write to stderr
because on Windows it cannot properly append to the file,
doesn't use CreateFile(..., FILE_APPEND_DATA, ...)
this fixes main.shutdown failures on Windows
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/My/ConfigFactory.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/lib/My/ConfigFactory.pm b/mysql-test/lib/My/ConfigFactory.pm index 8b997e8b096..12c0095e80e 100644 --- a/mysql-test/lib/My/ConfigFactory.pm +++ b/mysql-test/lib/My/ConfigFactory.pm @@ -246,7 +246,7 @@ my @mysqld_rules= { '#host' => \&fix_host }, { 'port' => \&fix_port }, { 'socket' => \&fix_socket }, - { '#log-error' => \&fix_log_error }, + { 'log-error' => \&fix_log_error }, { 'general-log' => 1 }, { 'plugin-dir' => sub { $::plugindir } }, { 'general-log-file' => \&fix_log }, @@ -394,7 +394,7 @@ sub post_check_embedded_group { my %no_copy = map { $_ => 1 } ( - '#log-error', # Embedded server writes stderr to mysqltest's log file + 'log-error', # Embedded server writes stderr to mysqltest's log file 'slave-net-timeout', # Embedded server are not build with replication 'shared-memory-base-name', # No shared memory for embedded ); |