diff options
| author | Alexey Yurchenko <ayurchen@gmail.com> | 2014-12-09 22:13:14 +0200 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-04 13:04:51 -0400 |
| commit | 822c00536d461d56e81dd9c519ec5ec1cde9536a (patch) | |
| tree | 8ae4bce142db8155aad73af4736ccfac8917c3d3 /scripts/wsrep_sst_mysqldump.sh | |
| parent | 2a6e1230e3a709ac91ac299ec81a18fb37538e4b (diff) | |
| download | mariadb-git-822c00536d461d56e81dd9c519ec5ec1cde9536a.tar.gz | |
Going more MTR-friendly - for SST prefer to use mysql client, mysqldump and my_print_defaults from the local build tree.
Diffstat (limited to 'scripts/wsrep_sst_mysqldump.sh')
| -rw-r--r-- | scripts/wsrep_sst_mysqldump.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/wsrep_sst_mysqldump.sh b/scripts/wsrep_sst_mysqldump.sh index 3db1d73bb9c..53371765f66 100644 --- a/scripts/wsrep_sst_mysqldump.sh +++ b/scripts/wsrep_sst_mysqldump.sh @@ -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 |