summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2016-04-29 16:59:25 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2016-04-29 16:59:25 -0400
commitc0238be6cfaaf17c7c3a6f3fc59937cc13cc00be (patch)
tree8704b1e9bd970d89e36f67b0053b9c7c72dfe0ee
parent8a1efa1bdd29b756c93a3ddbd8ad6fadec1082bc (diff)
parent51a32ebeb3653bfed481a3ddbfe5f93aecdf4a35 (diff)
downloadmariadb-git-c0238be6cfaaf17c7c3a6f3fc59937cc13cc00be.tar.gz
Merge branch '5.5-galera' into 10.0-galeramariadb-galera-10.0.25
-rw-r--r--scripts/wsrep_sst_xtrabackup-v2.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/wsrep_sst_xtrabackup-v2.sh b/scripts/wsrep_sst_xtrabackup-v2.sh
index 6357d811e44..074f36a11e9 100644
--- a/scripts/wsrep_sst_xtrabackup-v2.sh
+++ b/scripts/wsrep_sst_xtrabackup-v2.sh
@@ -856,7 +856,8 @@ then
then
if [[ -d ${DATA}/.sst ]];then
- wsrep_log_info "WARNING: Stale temporary SST directory: ${DATA}/.sst from previous state transfer"
+ wsrep_log_info "WARNING: Stale temporary SST directory: ${DATA}/.sst from previous state transfer. Removing"
+ rm -rf ${DATA}/.sst
fi
mkdir -p ${DATA}/.sst
(recv_joiner $DATA/.sst "${stagemsg}-SST" 0 0) &