diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-16 19:33:06 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-12-18 16:41:40 +0100 |
| commit | beabe6b2167ee7e8c2659da9507e33ddd56a9c29 (patch) | |
| tree | 8a9856601843931937843345982d7d3c760ab427 | |
| parent | 1c2f59f7fbacc0fa7c4037bf03630f849859ad45 (diff) | |
| download | mariadb-git-beabe6b2167ee7e8c2659da9507e33ddd56a9c29.tar.gz | |
MDEV-13969 sst mysqldump and xtrabackup-v2 handle WSREP_SST_OPT_CONF incorrectly
$WSREP_SST_OPT_CONF already includes --defaults-extra-file= prefix.
| -rw-r--r-- | scripts/wsrep_sst_mysqldump.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/wsrep_sst_mysqldump.sh b/scripts/wsrep_sst_mysqldump.sh index 59d9a3c5c9c..f086d9873d0 100644 --- a/scripts/wsrep_sst_mysqldump.sh +++ b/scripts/wsrep_sst_mysqldump.sh @@ -117,7 +117,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" |