Merge branch '10.0-galera' into 10.1

0a1c2a20 · Nirbhay Choubey · a87507ee · c0238be6 · 0a1c2a20
Commit 0a1c2a20 authored May 05, 2016 by Nirbhay Choubey
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

scripts/wsrep_sst_xtrabackup-v2.sh scripts/wsrep_sst_xtrabackup-v2.sh +2 -1

No files found.
--- a/scripts/wsrep_sst_xtrabackup-v2.sh
+++ b/scripts/wsrep_sst_xtrabackup-v2.sh
@@ -871,7 +871,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) &