diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-09-26 15:54:42 +0200 |
|---|---|---|
| committer | Daniel Black <grooverdan@users.sourceforge.net> | 2018-01-14 22:48:02 +1100 |
| commit | 943c62a5d4729786cb310f4a6af226184eb26196 (patch) | |
| tree | 7809f173f5e8d923b95ee139bac243ec2ce15196 /scripts/wsrep_sst_mysqldump.sh | |
| parent | d7b2bc98bf55dded58e4d5d4a19e4aa48b30b26b (diff) | |
| download | mariadb-git-943c62a5d4729786cb310f4a6af226184eb26196.tar.gz | |
Backport 4bb49d84a9df, correct handling on defaults[-extra]-file is SST scripts
(from 10.1 to 10.0-galera)
This conflicted signficantly with 7d550c76be13c58551e203f4eeb4f87ebd58ba4b
which added --defaults-group-suffix support.
Took the approach of 4bb49d84a9df and adapted the
--defaults-group-suffix handling to be consistent.
The following changes as follows:
SST scripts now use $MY_PRINT_DEFAULTS rather than the lowercase for
consistency and this include all required --default arguements.
Backport/merge by Daniel Black <daniel@linux.vnet.ibm.com>
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 f6f2187006d..2143176e6ba 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 @@ -106,7 +102,7 @@ GTID_BINLOG_STATE=$(echo "SHOW GLOBAL VARIABLES LIKE 'gtid_binlog_state'" |\ $MYSQL_CLIENT $AUTH -S$WSREP_SST_OPT_SOCKET --disable-reconnect --connect_timeout=10 |\ tail -1 | awk -F ' ' '{ print $2 }') -MYSQL="$MYSQL_CLIENT --defaults-extra-file=$WSREP_SST_OPT_CONF "\ +MYSQL="$MYSQL_CLIENT $WSREP_SST_OPT_CONF "\ "$AUTH -h${WSREP_SST_OPT_HOST_UNESCAPED:-$WSREP_SST_OPT_HOST} "\ "-P$WSREP_SST_OPT_PORT --disable-reconnect --connect_timeout=10" |