summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2019-03-07 08:06:50 +0200
committerJan Lindström <jan.lindstrom@mariadb.com>2019-03-09 08:41:35 +0200
commit9fb84a166ac3f4389d400439d13d2a790c18de1b (patch)
tree0f9ac14fe205bcc76f4cb59b85bca4fe6b12e83c /scripts
parenta05ca1a99a821eb8c9e117e681d37327f265fc92 (diff)
downloadmariadb-git-9fb84a166ac3f4389d400439d13d2a790c18de1b.tar.gz
remove WSREP_SST_OPT_SUFFIX_VALUE, checking [mysqld] is covered in the parse_cnf --mysqld case also in wsrep_sst_xtrabackup-v2
Diffstat (limited to 'scripts')
-rw-r--r--scripts/wsrep_sst_xtrabackup-v2.sh3
1 files changed, 0 insertions, 3 deletions
diff --git a/scripts/wsrep_sst_xtrabackup-v2.sh b/scripts/wsrep_sst_xtrabackup-v2.sh
index 5fad91df18b..54a7c8852e5 100644
--- a/scripts/wsrep_sst_xtrabackup-v2.sh
+++ b/scripts/wsrep_sst_xtrabackup-v2.sh
@@ -906,9 +906,6 @@ 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 "")
fi
if [ ! -z "$INNODB_DATA_HOME_DIR" ]; then