@@ -494,7 +494,7 @@ read_cnf()
494
494
ssystag+=" -"
495
495
496
496
if [[ $ssyslog -ne -1 ]]; then
497
- if $MY_PRINT_DEFAULTS -c $WSREP_SST_OPT_CONF mysqld_safe | tr ' _' ' -' | grep -q -- " --syslog" ; then
497
+ if $MY_PRINT_DEFAULTS mysqld_safe | tr ' _' ' -' | grep -q -- " --syslog" ; then
498
498
ssyslog=1
499
499
fi
500
500
fi
@@ -671,7 +671,7 @@ check_extra()
671
671
local use_socket=1
672
672
if [[ $uextra -eq 1 ]]; then
673
673
if $MY_PRINT_DEFAULTS --mysqld | tr ' _' ' -' | grep -- " --thread-handling=" | grep -q ' pool-of-threads' ; then
674
- local eport=$( $MY_PRINT_DEFAULTS -c $WSREP_SST_OPT_CONF mysqld | tr ' _' ' -' | grep -- " --extra-port=" | cut -d= -f2)
674
+ local eport=$( $MY_PRINT_DEFAULTS mysqld | tr ' _' ' -' | grep -- " --extra-port=" | cut -d= -f2)
675
675
if [[ -n $eport ]]; then
676
676
# Xtrabackup works only locally.
677
677
# Hence, setting host to 127.0.0.1 unconditionally.
@@ -867,14 +867,14 @@ if [[ $ssyslog -eq 1 ]];then
867
867
}
868
868
869
869
INNOAPPLY=" ${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$ rebuildcmd \$ {DATA} 2>&1 | logger -p daemon.err -t ${ssystag} innobackupex-apply "
870
- INNOMOVE=" ${INNOBACKUPEX_BIN} --defaults-file= ${WSREP_SST_OPT_CONF } $disver $impts --datadir=${DATA} --move-back --force-non-empty-directories \$ {DATA} 2>&1 | logger -p daemon.err -t ${ssystag} innobackupex-move "
871
- INNOBACKUP=" ${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF } $disver $iopts \$ tmpopts \$ INNOEXTRA --galera-info --stream=\$ sfmt \$ itmpdir 2> >(logger -p daemon.err -t ${ssystag} innobackupex-backup)"
870
+ INNOMOVE=" ${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_DEFAULT } $disver $impts --datadir=${DATA} --move-back --force-non-empty-directories \$ {DATA} 2>&1 | logger -p daemon.err -t ${ssystag} innobackupex-move "
871
+ INNOBACKUP=" ${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_DEFAULT } $disver $iopts \$ tmpopts \$ INNOEXTRA --galera-info --stream=\$ sfmt \$ itmpdir 2> >(logger -p daemon.err -t ${ssystag} innobackupex-backup)"
872
872
fi
873
873
874
874
else
875
875
INNOAPPLY=" ${INNOBACKUPEX_BIN} $disver $iapts --apply-log \$ rebuildcmd \$ {DATA} &>\$ {DATA}/innobackup.prepare.log"
876
- INNOMOVE=" ${INNOBACKUPEX_BIN} --defaults-file= ${WSREP_SST_OPT_CONF} --defaults-group=mysqld${WSREP_SST_OPT_CONF_SUFFIX} $disver $impts --datadir=${DATA} --move-back --force-non-empty-directories \$ {DATA} &>\$ {DATA}/innobackup.move.log"
877
- INNOBACKUP=" ${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_CONF } $disver $iopts \$ tmpopts \$ INNOEXTRA --galera-info --stream=\$ sfmt \$ itmpdir 2>\$ {DATA}/innobackup.backup.log"
876
+ INNOMOVE=" ${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_DEFAULT} --defaults-group=mysqld${WSREP_SST_OPT_CONF_SUFFIX} $disver $impts --datadir=${DATA} --move-back --force-non-empty-directories \$ {DATA} &>\$ {DATA}/innobackup.move.log"
877
+ INNOBACKUP=" ${INNOBACKUPEX_BIN} ${WSREP_SST_OPT_DEFAULT } $disver $iopts \$ tmpopts \$ INNOEXTRA --galera-info --stream=\$ sfmt \$ itmpdir 2>\$ {DATA}/innobackup.backup.log"
878
878
fi
879
879
880
880
get_stream
0 commit comments