summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorHartmut Holzgraefe <hartmut@php.net>2019-11-08 08:03:49 +0100
committerJan Lindström <jan.lindstrom@mariadb.com>2019-11-08 09:03:49 +0200
commitc4a844ca5143080426f92ef9de3f0a069a764d53 (patch)
treefac6e18081d79ee4d3335e17d46faa502fff4e10 /scripts
parentb1ab2ba5833ad466ea9c08b89d89bb51e1d445ed (diff)
downloadmariadb-git-c4a844ca5143080426f92ef9de3f0a069a764d53.tar.gz
MDEV-20981 wsrep_sst_mariabackup fails silently when mariabackup is not installed (#1406)
Make sure failure to find mariabackup binary does not terminate the script silently, terminate with a clear error message instead
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 cb4cb3bd1d4..59d2e12817b 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