mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
Remove duplicate script added due to bad merge.
This commit is contained in:
parent
8c44fd63ac
commit
41d4002987
1 changed files with 0 additions and 26 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue