1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Going more MTR-friendly - for SST prefer to use mysql client, mysqldump and my_print_defaults from the local build tree.

This commit is contained in:
Alexey Yurchenko
2014-12-09 22:13:14 +02:00
committed by Nirbhay Choubey
parent 2a6e1230e3
commit 822c00536d
5 changed files with 42 additions and 17 deletions

View File

@ -54,9 +54,9 @@ then
fi
# Check client version
if ! mysql --version | grep 'Distrib 5.5' >/dev/null
if ! $MYSQL_CLIENT --version | grep 'Distrib 5.5' >/dev/null
then
mysql --version >&2
$MYSQL_CLIENT --version >&2
wsrep_log_error "this operation requires MySQL client version 5.5.x"
exit $EINVAL
fi
@ -72,7 +72,7 @@ if test -n "$WSREP_SST_OPT_PSWD"; then AUTH="$AUTH -p$WSREP_SST_OPT_PSWD"; fi
STOP_WSREP="SET wsrep_on=OFF;"
# NOTE: we don't use --routines here because we're dumping mysql.proc table
MYSQLDUMP="mysqldump $AUTH -S$WSREP_SST_OPT_SOCKET \
MYSQLDUMP="$MYSQLDUMP $AUTH -S$WSREP_SST_OPT_SOCKET \
--add-drop-database --add-drop-table --skip-add-locks --create-options \
--disable-keys --extended-insert --skip-lock-tables --quick --set-charset \
--skip-comments --flush-privileges --all-databases"
@ -97,7 +97,7 @@ DROP PREPARE stmt;"
SET_START_POSITION="SET GLOBAL wsrep_start_position='$WSREP_SST_OPT_GTID';"
MYSQL="mysql $AUTH -h$WSREP_SST_OPT_HOST -P$WSREP_SST_OPT_PORT "\
MYSQL="$MYSQL_CLIENT $AUTH -h$WSREP_SST_OPT_HOST -P$WSREP_SST_OPT_PORT "\
"--disable-reconnect --connect_timeout=10"
# need to disable logging when loading the dump