diff options
author | Andrei Elkin <andrei.elkin@mariadb.com> | 2019-11-11 16:03:43 +0200 |
---|---|---|
committer | Andrei Elkin <andrei.elkin@mariadb.com> | 2019-11-11 16:03:43 +0200 |
commit | 26fd880d5eba5e46e69f88f21cc6ca45cbda0a4f (patch) | |
tree | a02a4bb6992f540cd229776680d381c730d2ea77 /scripts | |
parent | 142442d571dd86c630019ece82e36dc73e1e5f1b (diff) | |
parent | 13db50fc03e7312e6c01b06c7e4af69f69ba5382 (diff) | |
download | mariadb-git-26fd880d5eba5e46e69f88f21cc6ca45cbda0a4f.tar.gz |
manual merge 10.1->10.2
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/wsrep_sst_mariabackup.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/wsrep_sst_mariabackup.sh b/scripts/wsrep_sst_mariabackup.sh index 9dff0f1aa9c..55111b00ff9 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 |