summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-01-24 14:16:20 +0100
committerOleksandr Byelkin <sanja@mariadb.com>2020-01-24 14:16:20 +0100
commitceda5f724fd1ca1bcb6fb113af55179849c057d0 (patch)
treeb6d8305dd4fbfae5d8e05b2e6c67cfd65214dd7b /scripts
parentade89fc8980a0b2763734815df7634a129c6d5dc (diff)
parentf2ccfcaca191513d12f50672ae4545f9738670f0 (diff)
downloadmariadb-git-ceda5f724fd1ca1bcb6fb113af55179849c057d0.tar.gz
Merge branch '10.2' into 10.3
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