mirror of
https://github.com/MariaDB/server.git
synced 2025-08-16 18:19:41 +00: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:

committed by
Nirbhay Choubey

parent
91417b4047
commit
14b6172075
@ -57,9 +57,9 @@ then
|
||||
fi
|
||||
|
||||
# Check client version
|
||||
if ! mysql --version | grep 'Distrib 10.0' >/dev/null
|
||||
if ! $MYSQL_CLIENT --version | grep 'Distrib 10.0' >/dev/null
|
||||
then
|
||||
mysql --version >&2
|
||||
$MYSQL_CLIENT --version >&2
|
||||
wsrep_log_error "this operation requires MySQL client version 10.0.x"
|
||||
exit $EINVAL
|
||||
fi
|
||||
@ -98,10 +98,10 @@ SET_START_POSITION="SET GLOBAL wsrep_start_position='$WSREP_SST_OPT_GTID';"
|
||||
|
||||
# Retrieve the donor's @@global.gtid_binlog_state.
|
||||
GTID_BINLOG_STATE=$(echo "SHOW GLOBAL VARIABLES LIKE 'gtid_binlog_state'" |\
|
||||
mysql $AUTH -S$WSREP_SST_OPT_SOCKET --disable-reconnect --connect_timeout=10 |\
|
||||
$MYSQL_CLIENT $AUTH -S$WSREP_SST_OPT_SOCKET --disable-reconnect --connect_timeout=10 |\
|
||||
tail -1 | awk -F ' ' '{ print $2 }')
|
||||
|
||||
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"
|
||||
|
||||
# Check if binary logging is enabled on the joiner node.
|
||||
@ -133,7 +133,7 @@ then
|
||||
fi
|
||||
|
||||
# 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"
|
||||
|
Reference in New Issue
Block a user