From 99838736bc7bcbc1a0cfa5441d1ac15d6d34ef4c Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@skysql.com>
Date: Tue, 15 Apr 2014 14:27:45 -0400
Subject: [PATCH] MDEV#6098 mysqldump sst fails on maria-10.0-galera

* Removed the unnecessary call to wsrep_cleanup_progress_file,
  which was returning code 1 and eventually causing SST to fail.
* Also initialized the unused WSREP_SST_OPT_CONF to avoid error
  message.
---
 scripts/wsrep_sst_mysqldump.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/wsrep_sst_mysqldump.sh b/scripts/wsrep_sst_mysqldump.sh
index 466099db0d9..6a16f65c33d 100644
--- a/scripts/wsrep_sst_mysqldump.sh
+++ b/scripts/wsrep_sst_mysqldump.sh
@@ -17,6 +17,10 @@
 
 # This is a reference script for mysqldump-based state snapshot tansfer
 
+# This variable is not used in mysqldump sst, so better initialize it
+# to avoid shell's "parameter not set" message.
+WSREP_SST_OPT_CONF=""
+
 . $(dirname $0)/wsrep_sst_common
 
 EINVAL=22
@@ -119,5 +123,4 @@ else
     wsrep_log_info "Bypassing state dump."
     echo $SET_START_POSITION | $MYSQL
 fi
-wsrep_cleanup_progress_file
-#
+