File tree Expand file tree Collapse file tree 2 files changed +5
-19
lines changed Expand file tree Collapse file tree 2 files changed +5
-19
lines changed Original file line number Diff line number Diff line change 852
852
get_stream
853
853
get_transfer
854
854
855
- # This is as close as innobackupex gets to mysqld defaults. Important note --defaults-extra-file passed to
856
- # mysqld is not passed to innobackupex.
857
- # WSREP_SST_OPT_SUFFIX_DEFAULT goes from --defaults-group-suffix=.X to --defaults-group=mysqld.X
858
- # Ref: https://bugs.launchpad.net/codership-mysql/+bug/1378355
859
-
860
- readonly INNOBACKUP_OPT_DEFAULT=" ${$WSREP_SST_OPT_DEFAULT } ${WSREP_SST_OPT_SUFFIX_DEFAULT/ -suffix=/ =mysqld} "
861
-
862
855
INNOAPPLY=" ${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$ rebuildcmd \$ {DATA} ${INNOAPPLY} "
863
- INNOMOVE=" ${INNOBACKUPEX_BIN} ${INNOBACKUP_OPT_DEFAULT } $disver $impts --move-back --force-non-empty-directories \$ {DATA} ${INNOMOVE} "
864
- INNOBACKUP=" ${INNOBACKUPEX_BIN} ${INNOBACKUP_OPT_DEFAULT } $disver $iopts \$ tmpopts \$ INNOEXTRA --galera-info --stream=\$ sfmt \$ itmpdir ${INNOBACKUP} "
856
+ INNOMOVE=" ${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF } $disver $impts --move-back --force-non-empty-directories \$ {DATA} ${INNOMOVE} "
857
+ INNOBACKUP=" ${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF } $disver $iopts \$ tmpopts \$ INNOEXTRA --galera-info --stream=\$ sfmt \$ itmpdir ${INNOBACKUP} "
865
858
866
859
if [ " $WSREP_SST_OPT_ROLE " = " donor" ]
867
860
then
Original file line number Diff line number Diff line change @@ -398,16 +398,9 @@ setup_ports
398
398
get_stream
399
399
get_transfer
400
400
401
- # This is as close as innobackupex gets to mysqld defaults. Important note --defaults-extra-file passed to
402
- # mysqld is not passed to innobackupex.
403
- # WSREP_SST_OPT_SUFFIX_DEFAULT goes from --defaults-group-suffix=.X to --defaults-group=mysqld.X
404
- # Ref: https://bugs.launchpad.net/codership-mysql/+bug/1378355
405
-
406
- readonly INNOBACKUP_OPT_DEFAULT=" ${$WSREP_SST_OPT_DEFAULT } ${WSREP_SST_OPT_SUFFIX_DEFAULT/ -suffix=/ =mysqld} "
407
-
408
401
INNOEXTRA=" "
409
- INNOAPPLY=" ${INNOBACKUPEX_BIN} ${INNOBACKUP_OPT_DEFAULT } --apply-log \$ rebuildcmd \$ {DATA} &>\$ {DATA}/innobackup.prepare.log"
410
- INNOBACKUP=" ${INNOBACKUPEX_BIN} ${INNOBACKUP_OPT_DEFAULT } \$ INNOEXTRA --galera-info --stream=\$ sfmt \$ {TMPDIR} 2>\$ {DATA}/innobackup.backup.log"
402
+ INNOAPPLY=" ${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF } --apply-log \$ rebuildcmd \$ {DATA} &>\$ {DATA}/innobackup.prepare.log"
403
+ INNOBACKUP=" ${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF } \$ INNOEXTRA --galera-info --stream=\$ sfmt \$ {TMPDIR} 2>\$ {DATA}/innobackup.backup.log"
411
404
412
405
if [ " $WSREP_SST_OPT_ROLE " = " donor" ]
413
406
then
660
653
661
654
if [[ $incremental -eq 1 ]]; then
662
655
# Added --ibbackup=xtrabackup_55 because it fails otherwise citing connection issues.
663
- INNOAPPLY=" ${INNOBACKUPEX_BIN} ${INNOBACKUP_OPT_DEFAULT } \
656
+ INNOAPPLY=" ${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF } \
664
657
--ibbackup=xtrabackup_55 --apply-log $rebuildcmd --redo-only $BDATA --incremental-dir=${DATA} &>>${BDATA} /innobackup.prepare.log"
665
658
fi
666
659
You can’t perform that action at this time.
0 commit comments