diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-26 11:12:38 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-03-26 11:12:38 -0400 |
| commit | b5871a51e99f2d591e944590f2e2332275064d07 (patch) | |
| tree | e27d70c77ad6cd9f399c6063899c0d3d6d2735c6 /scripts | |
| parent | 7d892f69a565e583eb692d01e2e80a158ee795fe (diff) | |
| download | mariadb-git-b5871a51e99f2d591e944590f2e2332275064d07.tar.gz | |
* bzr merge -r4027..4061 codership/5.6
* Merged Innodb changes to xtradb
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/wsrep_sst_xtrabackup-v2.sh | 8 | ||||
| -rw-r--r-- | scripts/wsrep_sst_xtrabackup.sh | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/scripts/wsrep_sst_xtrabackup-v2.sh b/scripts/wsrep_sst_xtrabackup-v2.sh index 59017fff8df..c296c903007 100644 --- a/scripts/wsrep_sst_xtrabackup-v2.sh +++ b/scripts/wsrep_sst_xtrabackup-v2.sh @@ -294,7 +294,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) speciald=$(parse_cnf sst sst-special-dirs 1) iopts=$(parse_cnf sst inno-backup-opts "") iapts=$(parse_cnf sst inno-apply-opts "") @@ -648,10 +648,6 @@ then [[ -n $SST_PROGRESS_FILE ]] && touch $SST_PROGRESS_FILE if [[ $speciald -eq 1 ]];then - wsrep_log_info "WARNING: sst-special-dirs feature requires PXC 2.1.6 or latter." - fi - - if [[ $speciald -eq 1 ]];then ib_home_dir=$(parse_cnf mysqld innodb-data-home-dir "") ib_log_dir=$(parse_cnf mysqld innodb-log-group-home-dir "") if [[ -z $ib_home_dir && -z $ib_log_dir ]];then @@ -827,7 +823,7 @@ then if [[ $incremental -eq 1 ]];then # Added --ibbackup=xtrabackup_55 because it fails otherwise citing connection issues. - INNOAPPLY="${INNOBACKUPEX_BIN} --defaults-file=${WSREP_SST_OPT_CONF} \ + INNOAPPLY="${INNOBACKUPEX_BIN} $disver --defaults-file=${WSREP_SST_OPT_CONF} \ --ibbackup=xtrabackup_55 --apply-log $rebuildcmd --redo-only $BDATA --incremental-dir=${DATA} &>>${BDATA}/innobackup.prepare.log" fi diff --git a/scripts/wsrep_sst_xtrabackup.sh b/scripts/wsrep_sst_xtrabackup.sh index 3948b15c53b..33f2f07946e 100644 --- a/scripts/wsrep_sst_xtrabackup.sh +++ b/scripts/wsrep_sst_xtrabackup.sh @@ -38,6 +38,8 @@ # Make sure to read that before proceeding! + + . $(dirname $0)/wsrep_sst_common ealgo="" @@ -609,8 +611,6 @@ then if [[ $ecode -ne 0 ]];then wsrep_log_error "Error while getting data from donor node: " \ "exit codes: ${RC[@]}" - wsrep_log_error "Data directory ${DATA} needs to be empty for SST:" \ - "Manual intervention required in that case" exit 32 fi done |