diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-06-21 23:09:10 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-06-21 23:09:10 -0400 |
| commit | 41d40029875bfd7f4cd6a5255e05a3c93103220f (patch) | |
| tree | 53155bca0e158eca8175c0125b021b64df3a5ea7 /scripts | |
| parent | 8c44fd63ac61161e92e7feb55d693d72aebac68d (diff) | |
| download | mariadb-git-41d40029875bfd7f4cd6a5255e05a3c93103220f.tar.gz | |
Remove duplicate script added due to bad merge.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/wsrep_sst_common.sh | 26 |
1 files changed, 0 insertions, 26 deletions
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 |