Skip to content

Commit beabe6b

Browse files
committed
MDEV-13969 sst mysqldump and xtrabackup-v2 handle WSREP_SST_OPT_CONF incorrectly
$WSREP_SST_OPT_CONF already includes --defaults-extra-file= prefix.
1 parent 1c2f59f commit beabe6b

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

scripts/wsrep_sst_mysqldump.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ GTID_BINLOG_STATE=$(echo "SHOW GLOBAL VARIABLES LIKE 'gtid_binlog_state'" |\
117117
$MYSQL_CLIENT $AUTH -S$WSREP_SST_OPT_SOCKET --disable-reconnect --connect_timeout=10 |\
118118
tail -1 | awk -F ' ' '{ print $2 }')
119119

120-
MYSQL="$MYSQL_CLIENT --defaults-extra-file=$WSREP_SST_OPT_CONF "\
120+
MYSQL="$MYSQL_CLIENT $WSREP_SST_OPT_CONF "\
121121
"$AUTH -h${WSREP_SST_OPT_HOST_UNESCAPED:-$WSREP_SST_OPT_HOST} "\
122122
"-P$WSREP_SST_OPT_PORT --disable-reconnect --connect_timeout=10"
123123

0 commit comments

Comments
 (0)