Reverting changes made to support the mtr under the root

MariaDB · Aug 13, 2018 · 3683271 · 3683271
1 parent 7e8ed15
commit 3683271
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 11 deletions.
diff --git a/mysql-test/suite/galera/include/galera_wsrep_recover.inc b/mysql-test/suite/galera/include/galera_wsrep_recover.inc
@@ -1,14 +1,5 @@
 --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
-}
 
 --perl
 	use strict;

diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh
@@ -365,8 +365,6 @@ $SILENT
     path = $INNODB_DATA_HOME_DIR
 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
 
     # listen at all interfaces (for firewalled setups)