diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-03 08:09:06 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-03 08:09:06 +0100 |
| commit | c383418cbf754c654a9a705ddb73a107e390ecb2 (patch) | |
| tree | c67137c7c6a016474c4febde3ac52bc61934068d /scripts/wsrep_sst_mysqldump.sh | |
| parent | f69a3b2e920a9409d33c0f36227cb42b1ec5a332 (diff) | |
| parent | c7e5feb2596e2a032207191320dbf1387d440959 (diff) | |
| download | mariadb-git-c383418cbf754c654a9a705ddb73a107e390ecb2.tar.gz | |
Merge branch 'github/10.0-galera' into 10.1
Diffstat (limited to 'scripts/wsrep_sst_mysqldump.sh')
| -rw-r--r-- | scripts/wsrep_sst_mysqldump.sh | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/scripts/wsrep_sst_mysqldump.sh b/scripts/wsrep_sst_mysqldump.sh index 6addb5d21ea..358247359e6 100644 --- a/scripts/wsrep_sst_mysqldump.sh +++ b/scripts/wsrep_sst_mysqldump.sh @@ -17,10 +17,6 @@ # This is a reference script for mysqldump-based state snapshot tansfer -# This variable is not used in mysqldump sst, so better initialize it -# to avoid shell's "parameter not set" message. -WSREP_SST_OPT_CONF="" - . $(dirname $0)/wsrep_sst_common PATH=$PATH:/usr/sbin:/usr/bin:/sbin:/bin @@ -118,7 +114,7 @@ $MYSQL_CLIENT $AUTH -S$WSREP_SST_OPT_SOCKET --disable-reconnect --connect_timeou tail -1 | awk -F ' ' '{ print $2 }') MYSQL="$MYSQL_CLIENT $WSREP_SST_OPT_CONF "\ -"$AUTH -h${WSREP_SST_OPT_HOST_UNESCAPED:-$WSREP_SST_OPT_HOST} "\ +"$AUTH -h${WSREP_SST_OPT_HOST_UNESCAPED} "\ "-P$WSREP_SST_OPT_PORT --disable-reconnect --connect_timeout=10" # Check if binary logging is enabled on the joiner node. |