summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorsjaakola <seppo.jaakola@iki.fi>2018-03-11 16:50:37 +0200
committersjaakola <seppo.jaakola@iki.fi>2018-03-11 16:50:37 +0200
commitc439fdc953e9e4f48290c7fc26cee45392475645 (patch)
treeedf80eca329cb7959fe822468896ef9a02656336 /mysql-test
parenta050189773c911e0b9689aa212c44aaa0cea7b66 (diff)
downloadmariadb-git-c439fdc953e9e4f48290c7fc26cee45392475645.tar.gz
MDEV-15540
The error log redirection for wsrep_recover run does not work in old version. For the wsrep_recovery run, error logging is supposed to go into: mysql-test/suite/galera/include/galera_wsrep_recover.inc In old version, this works only partially, 4 first lines of error messages after mysql startup do go into the galera_wsrep_recover.log, but after that the default error log file is enforced and remaining error logging goes into the default error log file. In this patch this problem is fixed by passing --log-error option in mysql startup This fix was tested with galera_gcache_recover test, which is currently in disabled state. Note that the test does not pass even after this fix, as there are further more issues in later test phases.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/suite/galera/include/galera_wsrep_recover.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysql-test/suite/galera/include/galera_wsrep_recover.inc b/mysql-test/suite/galera/include/galera_wsrep_recover.inc
index 090ffe5f5df..d2956ea99e6 100644
--- a/mysql-test/suite/galera/include/galera_wsrep_recover.inc
+++ b/mysql-test/suite/galera/include/galera_wsrep_recover.inc
@@ -1,5 +1,5 @@
--echo Performing --wsrep-recover ...
---exec $MYSQLD --defaults-group-suffix=.$galera_wsrep_recover_server_id --defaults-file=$MYSQLTEST_VARDIR/my.cnf --innodb --wsrep-recover > $MYSQL_TMP_DIR/galera_wsrep_recover.log 2>&1
+--exec $MYSQLD --defaults-group-suffix=.$galera_wsrep_recover_server_id --defaults-file=$MYSQLTEST_VARDIR/my.cnf --log-error=$MYSQL_TMP_DIR/galera_wsrep_recover.log --innodb --wsrep-recover > $MYSQL_TMP_DIR/galera_wsrep_recover.log 2>&1
--perl
use strict;