From 41d40029875bfd7f4cd6a5255e05a3c93103220f Mon Sep 17 00:00:00 2001
From: Nirbhay Choubey <nirbhay@mariadb.com>
Date: Sun, 21 Jun 2015 23:09:10 -0400
Subject: Remove duplicate script added due to bad merge.

---
 scripts/wsrep_sst_common.sh | 26 --------------------------
 1 file changed, 26 deletions(-)

(limited to 'scripts')

diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh
index e23afc94511..46f4076111f 100644
--- a/scripts/wsrep_sst_common.sh
+++ b/scripts/wsrep_sst_common.sh
@@ -124,32 +124,6 @@ else
     MY_PRINT_DEFAULTS=$(which my_print_defaults)
 fi
 
-# try to use my_print_defaults, mysql and mysqldump that come with the sources
-# (for MTR suite)
-SCRIPTS_DIR="$(cd $(dirname "$0"); pwd -P)"
-EXTRA_DIR="$SCRIPTS_DIR/../extra"
-CLIENT_DIR="$SCRIPTS_DIR/../client"
-
-if [ -x "$CLIENT_DIR/mysql" ]; then
-    MYSQL_CLIENT="$CLIENT_DIR/mysql"
-else
-    MYSQL_CLIENT=$(which mysql)
-fi
-
-if [ -x "$CLIENT_DIR/mysqldump" ]; then
-    MYSQLDUMP="$CLIENT_DIR/mysqldump"
-else
-    MYSQLDUMP=$(which mysqldump)
-fi
-
-if [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then
-    MY_PRINT_DEFAULTS="$SCRIPTS_DIR/my_print_defaults"
-elif [ -x "$EXTRA_DIR/my_print_defaults" ]; then
-    MY_PRINT_DEFAULTS="$EXTRA_DIR/my_print_defaults"
-else
-    MY_PRINT_DEFAULTS=$(which my_print_defaults)
-fi
-
 # For Bug:1200727
 if $MY_PRINT_DEFAULTS -c $WSREP_SST_OPT_CONF sst | grep -q "wsrep_sst_auth";then
     if [ -z "$WSREP_SST_OPT_AUTH" -o "$WSREP_SST_OPT_AUTH" = "(null)" ];then
-- 
cgit v1.2.1