summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Black <grooverdan@users.sourceforge.net>2018-01-02 13:40:05 +1100
committerDaniel Black <grooverdan@users.sourceforge.net>2018-01-13 22:29:09 +1100
commit7dc51833172d4d0a2e7f218a1fa6380d5bee35fe (patch)
tree5c27d904743f8aea9892d1f101b391ca17b7e9ac
parent7e4c185c774cabaa1912760e143d9385ce959eea (diff)
downloadmariadb-git-7dc51833172d4d0a2e7f218a1fa6380d5bee35fe.tar.gz
wsrep_sst_rsync: read correct configuration sections
4bb49d84a9df had a single option, --mysqld to obtain the required innodb_log_group_home_dir. 83664e21e4fb675 enumberated the groups when --mysqld was sufficient.
-rw-r--r--scripts/wsrep_sst_rsync.sh14
1 files changed, 1 insertions, 13 deletions
diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh
index c6e8a7ef4e1..de881459975 100644
--- a/scripts/wsrep_sst_rsync.sh
+++ b/scripts/wsrep_sst_rsync.sh
@@ -102,19 +102,7 @@ fi
WSREP_LOG_DIR=${WSREP_LOG_DIR:-""}
# if WSREP_LOG_DIR env. variable is not set, try to get it from my.cnf
if [ -z "$WSREP_LOG_DIR" ]; then
- WSREP_LOG_DIR=$(parse_cnf mariadb-10.0 innodb_log_group_home_dir "")
-fi
-if [ -z "$WSREP_LOG_DIR" ]; then
- WSREP_LOG_DIR=$(parse_cnf mysqld innodb_log_group_home_dir "")
-fi
-if [ -z "$WSREP_LOG_DIR" ]; then
- WSREP_LOG_DIR=$(parse_cnf server innodb_log_group_home_dir "")
-fi
-if [ -z "$WSREP_LOG_DIR" ]; then
- WSREP_LOG_DIR=$(parse_cnf mariadb innodb_log_group_home_dir "")
-fi
-if [ -z "$WSREP_LOG_DIR" ]; then
- WSREP_LOG_DIR=$(parse_cnf mysqld-10.0 innodb_log_group_home_dir "")
+ WSREP_LOG_DIR=$(parse_cnf --mysqld innodb_log_group_home_dir "")
fi
if [ -n "$WSREP_LOG_DIR" ]; then