Commit 64356509 authored by Julius Goryavsky's avatar Julius Goryavsky

galera SST scripts: moving mysqldump-specific code out of the wsrep_sst_common

parent 228cb073
...@@ -865,19 +865,6 @@ readonly WSREP_SST_OPT_ADDR_PORT ...@@ -865,19 +865,6 @@ readonly WSREP_SST_OPT_ADDR_PORT
script_binary=$(dirname "$0") script_binary=$(dirname "$0")
SCRIPTS_DIR=$(cd "$script_binary"; pwd) SCRIPTS_DIR=$(cd "$script_binary"; pwd)
EXTRA_DIR="$SCRIPTS_DIR/../extra" EXTRA_DIR="$SCRIPTS_DIR/../extra"
CLIENT_DIR="$SCRIPTS_DIR/../client"
if [ -x "$CLIENT_DIR/mysql" ]; then
MYSQL_CLIENT="$CLIENT_DIR/mysql"
else
MYSQL_CLIENT=$(commandex 'mysql')
fi
if [ -x "$CLIENT_DIR/mysqldump" ]; then
MYSQLDUMP="$CLIENT_DIR/mysqldump"
else
MYSQLDUMP=$(commandex 'mysqldump')
fi
if [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then if [ -x "$SCRIPTS_DIR/my_print_defaults" ]; then
MY_PRINT_DEFAULTS="$SCRIPTS_DIR/my_print_defaults" MY_PRINT_DEFAULTS="$SCRIPTS_DIR/my_print_defaults"
......
...@@ -23,6 +23,20 @@ set -ue ...@@ -23,6 +23,20 @@ set -ue
. $(dirname "$0")/wsrep_sst_common . $(dirname "$0")/wsrep_sst_common
CLIENT_DIR="$SCRIPTS_DIR/../client"
if [ -x "$CLIENT_DIR/mysql" ]; then
MYSQL_CLIENT="$CLIENT_DIR/mysql"
else
MYSQL_CLIENT=$(commandex 'mysql')
fi
if [ -x "$CLIENT_DIR/mysqldump" ]; then
MYSQLDUMP="$CLIENT_DIR/mysqldump"
else
MYSQLDUMP=$(commandex 'mysqldump')
fi
wait_previous_sst wait_previous_sst
EINVAL=22 EINVAL=22
...@@ -37,7 +51,8 @@ if is_local_ip "$WSREP_SST_OPT_HOST_UNESCAPED" && \ ...@@ -37,7 +51,8 @@ if is_local_ip "$WSREP_SST_OPT_HOST_UNESCAPED" && \
[ "$WSREP_SST_OPT_PORT" = "$WSREP_SST_OPT_LPORT" ] [ "$WSREP_SST_OPT_PORT" = "$WSREP_SST_OPT_LPORT" ]
then then
wsrep_log_error \ wsrep_log_error \
"destination address '$WSREP_SST_OPT_HOST:$WSREP_SST_OPT_PORT' matches source address." "destination address '$WSREP_SST_OPT_HOST:$WSREP_SST_OPT_PORT'" \
"matches source address."
exit $EINVAL exit $EINVAL
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment