diff options
| author | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 17:07:17 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@skysql.com> | 2014-05-21 17:07:17 -0400 |
| commit | 0b98d2fd2ab337d95b6b502b15ea86368c441026 (patch) | |
| tree | 43b49a7f5ccb94114797fcae41015ab9055685c4 /scripts | |
| parent | 0903e2b744f627f57a99edd5d2b6ffdec1ef4a03 (diff) | |
| download | mariadb-git-0b98d2fd2ab337d95b6b502b15ea86368c441026.tar.gz | |
bzr merge -r4065..4088 codership/5.6
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/wsrep_sst_mysqldump.sh | 2 | ||||
| -rw-r--r-- | scripts/wsrep_sst_xtrabackup-v2.sh | 19 |
2 files changed, 19 insertions, 2 deletions
diff --git a/scripts/wsrep_sst_mysqldump.sh b/scripts/wsrep_sst_mysqldump.sh index 94c6ef42955..3fce316f379 100644 --- a/scripts/wsrep_sst_mysqldump.sh +++ b/scripts/wsrep_sst_mysqldump.sh @@ -128,5 +128,5 @@ else wsrep_log_info "Bypassing state dump." echo $SET_START_POSITION | $MYSQL fi -wsrep_cleanup_progress_file + # diff --git a/scripts/wsrep_sst_xtrabackup-v2.sh b/scripts/wsrep_sst_xtrabackup-v2.sh index 61e5d111aa9..f4d133d4f8e 100644 --- a/scripts/wsrep_sst_xtrabackup-v2.sh +++ b/scripts/wsrep_sst_xtrabackup-v2.sh @@ -860,10 +860,27 @@ then fi fi + + if [[ ! -z $WSREP_SST_OPT_BINLOG ]];then + + BINLOG_DIRNAME=$(dirname $WSREP_SST_OPT_BINLOG) + BINLOG_FILENAME=$(basename $WSREP_SST_OPT_BINLOG) + + # To avoid comparing data directory and BINLOG_DIRNAME + mv $DATA/${BINLOG_FILENAME}.* $BINLOG_DIRNAME/ 2>/dev/null || true + + pushd $BINLOG_DIRNAME &>/dev/null + for bfiles in $(ls -1 ${BINLOG_FILENAME}.*);do + echo ${BINLOG_DIRNAME}/${bfiles} >> ${BINLOG_FILENAME}.index + done + popd &> /dev/null + + fi + if [[ $incremental -eq 1 ]];then # Added --ibbackup=xtrabackup_55 because it fails otherwise citing connection issues. 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" + --ibbackup=xtrabackup_56 --apply-log $rebuildcmd --redo-only $BDATA --incremental-dir=${DATA} &>>${BDATA}/innobackup.prepare.log" fi wsrep_log_info "Preparing the backup at ${DATA}" |