summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2019-11-12 17:21:37 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2019-11-12 17:21:37 +0200
commit1fe6e5a1a5ab1b8f6d64bf33c57f75ede55714b2 (patch)
treecacbab7a1228dbba771b28784ec88515f9ac0fa5 /scripts
parente26d049197daef399a457d36e545d7ab5700c29a (diff)
parent33cb10d4e9793d1b6800be22e8eb9ceffdd8af4a (diff)
downloadmariadb-git-1fe6e5a1a5ab1b8f6d64bf33c57f75ede55714b2.tar.gz
Merge 10.4 into 10.5
Diffstat (limited to 'scripts')
-rw-r--r--scripts/wsrep_sst_mariabackup.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh
index 36deeff779d..8d1a36561d3 100644
--- a/scripts/wsrep_sst_mariabackup.sh
+++ b/scripts/wsrep_sst_mariabackup.sh
@@ -83,7 +83,14 @@ fi
pcmd="pv $pvopts"
declare -a RC
+set +e
INNOBACKUPEX_BIN=$(which mariabackup)
+if test -z $INNOBACKUPEX_BIN
+then
+ wsrep_log_error 'mariabackup binary not found in $PATH'
+ exit 42
+fi
+set -e
XBSTREAM_BIN=mbstream
XBCRYPT_BIN=xbcrypt # Not available in MariaBackup