summaryrefslogtreecommitdiff
path: root/scripts/wsrep_sst_mysqldump.sh
diff options
context:
space:
mode:
authorPhilip Stoev <philip.stoev@galeracluster.com>2015-07-07 22:34:25 -0700
committerNirbhay Choubey <nirbhay@mariadb.com>2015-09-09 17:03:32 -0400
commitbee94cc9f4ef58c5bb3d10393a9e92bcd32994f0 (patch)
tree92f74e71aa8260b11691e35ef00ea91b93f28f8d /scripts/wsrep_sst_mysqldump.sh
parent55dfddff1d99db73f19cdbd1eff3222f2acd181d (diff)
downloadmariadb-git-bee94cc9f4ef58c5bb3d10393a9e92bcd32994f0.tar.gz
Fixes codership/mysql-wsrep#153 use --defaults-extra-file with mysqldump SST
Diffstat (limited to 'scripts/wsrep_sst_mysqldump.sh')
-rw-r--r--scripts/wsrep_sst_mysqldump.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/wsrep_sst_mysqldump.sh b/scripts/wsrep_sst_mysqldump.sh
index b470ea6095b..988f9232da8 100644
--- a/scripts/wsrep_sst_mysqldump.sh
+++ b/scripts/wsrep_sst_mysqldump.sh
@@ -77,7 +77,8 @@ 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 --defaults-extra-file=$WSREP_SST_OPT_CONF \
+$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 --events"
@@ -102,7 +103,8 @@ DROP PREPARE stmt;"
SET_START_POSITION="SET GLOBAL wsrep_start_position='$WSREP_SST_OPT_GTID';"
-MYSQL="$MYSQL_CLIENT $AUTH -h$WSREP_SST_OPT_HOST -P$WSREP_SST_OPT_PORT "\
+MYSQL="$MYSQL_CLIENT --defaults-extra-file=$WSREP_SST_OPT_CONF "\
+"$AUTH -h$WSREP_SST_OPT_HOST -P$WSREP_SST_OPT_PORT "\
"--disable-reconnect --connect_timeout=10"
# need to disable logging when loading the dump