diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-28 14:17:09 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-01-28 14:17:09 +0200 |
| commit | a983b2440767db660bdf38c4f8bb3a0b0f7b1d65 (patch) | |
| tree | 04beefc3687b10e2e2322e7c586aede2c4e272a2 /scripts | |
| parent | a915142f48a42237021be590de37ffab4cc5b107 (diff) | |
| parent | bc891054962bc7cbd249f1ff75c64adb3b5bbc59 (diff) | |
| download | mariadb-git-a983b2440767db660bdf38c4f8bb3a0b0f7b1d65.tar.gz | |
Merge 10.4 into 10.5
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 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 |