diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-24 13:46:49 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-01-24 13:46:49 +0100 |
commit | f2ccfcaca191513d12f50672ae4545f9738670f0 (patch) | |
tree | b72f61d8ae7904020d97eb76fb7b7680883d323e /scripts | |
parent | ac3e3e12adad505b9f09bd068ddd6819ac084a05 (diff) | |
parent | 599a06098b967db3d636c1053bdbdd0011cba606 (diff) | |
download | mariadb-git-f2ccfcaca191513d12f50672ae4545f9738670f0.tar.gz |
Merge branch '10.1' into 10.2
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/wsrep_sst_mariabackup.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh index 55111b00ff9..4eb9917d341 100644 --- a/scripts/wsrep_sst_mariabackup.sh +++ b/scripts/wsrep_sst_mariabackup.sh @@ -386,8 +386,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 |