diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2019-03-05 14:01:02 +1100 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2019-03-09 08:41:35 +0200 |
| commit | 85a18526bc210e05c8a6feeb053c08f6e8cc867f (patch) | |
| tree | d13f3515fe8b7c64b180546160bd0df4eba7c122 /scripts/wsrep_sst_rsync.sh | |
| parent | 0957d257815871237343f2be4db34786b12dddd5 (diff) | |
| download | mariadb-git-85a18526bc210e05c8a6feeb053c08f6e8cc867f.tar.gz | |
wsrep_sst: remove WSREP_SST_OPT_SUFFIX_VALUE, checking [mysqld] is covered in the parse_cnf --mysqld case
Diffstat (limited to 'scripts/wsrep_sst_rsync.sh')
| -rw-r--r-- | scripts/wsrep_sst_rsync.sh | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index 6b1a7eb6ee6..bc2af40e2a9 100644 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -136,10 +136,7 @@ if [ ! -z "$INNODB_DATA_HOME_DIR_ARG" ]; then fi # if INNODB_DATA_HOME_DIR env. variable is not set, try to get it from my.cnf if [ -z "$INNODB_DATA_HOME_DIR" ]; then - INNODB_DATA_HOME_DIR=$(parse_cnf mysqld$WSREP_SST_OPT_SUFFIX_VALUE innodb-data-home-dir '') -fi -if [ -z "$INNODB_DATA_HOME_DIR" ]; then - INNODB_DATA_HOME_DIR=$(parse_cnf --mysqld innodb-data-home-dir "") + INNODB_DATA_HOME_DIR=$(parse_cnf --mysqld innodb-data-home-dir '') fi if [ -n "$INNODB_DATA_HOME_DIR" ]; then |