summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-01-24 14:50:23 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2020-01-24 14:50:23 +0100
commitbfc24bb2ecff2f9a305307086cd4c3c4aae14eaa (patch)
tree9b01539207b6c11cba84b83d3ab8e78cd51de79e /scripts
parent2833e906190e4fa3b0261a204822d419542aebe7 (diff)
parentceda5f724fd1ca1bcb6fb113af55179849c057d0 (diff)
downloadmariadb-git-bfc24bb2ecff2f9a305307086cd4c3c4aae14eaa.tar.gz
Merge branch '10.3' into 10.4
Diffstat (limited to 'scripts')
-rw-r--r--scripts/wsrep_sst_mariabackup.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh
index 8d1a36561d3..799276258f2 100644
--- a/scripts/wsrep_sst_mariabackup.sh
+++ b/scripts/wsrep_sst_mariabackup.sh
@@ -385,8 +385,8 @@ read_cnf()
get_stream()
{
- if [[ $sfmt == 'xbstream' ]];then
- wsrep_log_info "Streaming with xbstream"
+ if [[ $sfmt == 'mbstream' || $sfmt == 'xbstream' ]];then
+ wsrep_log_info "Streaming with ${sfmt}"
if [[ "$WSREP_SST_OPT_ROLE" == "joiner" ]];then
strmcmd="${XBSTREAM_BIN} -x"
else