Commit 36832711 authored by Julius Goryavsky's avatar Julius Goryavsky

Reverting changes made to support the mtr under the root

parent 7e8ed15b
--echo Performing --wsrep-recover ... --echo Performing --wsrep-recover ...
#
# When mysqld is run by a root user it will fail to start unless
# we specify what user is ran it (using "--user root" option):
#
if ($MYSQL_TEST_ROOT == 1) {
--exec $MYSQLD --defaults-group-suffix=.$galera_wsrep_recover_server_id --defaults-file=$MYSQLTEST_VARDIR/my.cnf --innodb --wsrep-recover --user root > $MYSQL_TMP_DIR/galera_wsrep_recover.log 2>&1
}
if ($MYSQL_TEST_ROOT != 1) {
--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 --innodb --wsrep-recover > $MYSQL_TMP_DIR/galera_wsrep_recover.log 2>&1
}
--perl --perl
use strict; use strict;
......
...@@ -365,8 +365,6 @@ $SILENT ...@@ -365,8 +365,6 @@ $SILENT
path = $INNODB_DATA_HOME_DIR path = $INNODB_DATA_HOME_DIR
EOF EOF
[ "$(whoami)" != root ] || sed -i '/read only = no/s/.*/&\nuid = root\ngid = root\n/' "$RSYNC_CONF"
# rm -rf "$DATA"/ib_logfile* # we don't want old logs around # rm -rf "$DATA"/ib_logfile* # we don't want old logs around
# listen at all interfaces (for firewalled setups) # listen at all interfaces (for firewalled setups)
......
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