diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-09-26 15:54:42 +0200 |
|---|---|---|
| committer | Daniel Black <grooverdan@users.sourceforge.net> | 2018-01-14 22:48:02 +1100 |
| commit | 943c62a5d4729786cb310f4a6af226184eb26196 (patch) | |
| tree | 7809f173f5e8d923b95ee139bac243ec2ce15196 /scripts/wsrep_sst_rsync.sh | |
| parent | d7b2bc98bf55dded58e4d5d4a19e4aa48b30b26b (diff) | |
| download | mariadb-git-943c62a5d4729786cb310f4a6af226184eb26196.tar.gz | |
Backport 4bb49d84a9df, correct handling on defaults[-extra]-file is SST scripts
(from 10.1 to 10.0-galera)
This conflicted signficantly with 7d550c76be13c58551e203f4eeb4f87ebd58ba4b
which added --defaults-group-suffix support.
Took the approach of 4bb49d84a9df and adapted the
--defaults-group-suffix handling to be consistent.
The following changes as follows:
SST scripts now use $MY_PRINT_DEFAULTS rather than the lowercase for
consistency and this include all required --default arguements.
Backport/merge by Daniel Black <daniel@linux.vnet.ibm.com>
Diffstat (limited to 'scripts/wsrep_sst_rsync.sh')
| -rw-r--r-- | scripts/wsrep_sst_rsync.sh | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index 1c1b09ce68f..5617142ea99 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 |