From d41cb26161f38551e78494007b49ca7e368b40fd Mon Sep 17 00:00:00 2001 From: Markus Weippert Date: Tue, 21 Nov 2017 12:37:17 +0100 Subject: [PATCH] Fix innodb_log_group_home_dir outside data dir with rsync sst --- scripts/wsrep_sst_rsync.sh | 6 +++--- scripts/wsrep_sst_xtrabackup.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index cfff524c8fd..6db2ab3b7da 100644 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -92,13 +92,13 @@ 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 mysqld-5.6 innodb_log_group_home_dir "") + WSREP_LOG_DIR=$(parse_cnf mysqld-5.6 innodb-log-group-home-dir "") fi if [ -z "$WSREP_LOG_DIR" ]; then - WSREP_LOG_DIR=$(parse_cnf mysqld innodb_log_group_home_dir "") + 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 "") + WSREP_LOG_DIR=$(parse_cnf server innodb-log-group-home-dir "") fi if [ -n "$WSREP_LOG_DIR" ]; then diff --git a/scripts/wsrep_sst_xtrabackup.sh b/scripts/wsrep_sst_xtrabackup.sh index 79a7476c443..11d9e8d46a3 100644 --- a/scripts/wsrep_sst_xtrabackup.sh +++ b/scripts/wsrep_sst_xtrabackup.sh @@ -261,7 +261,7 @@ read_cnf() ekeyfile=$(parse_cnf sst encrypt-key-file "") fi rlimit=$(parse_cnf sst rlimit "") - uextra=$(parse_cnf sst use_extra 0) + uextra=$(parse_cnf sst use-extra 0) } get_stream()