summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbhay Choubey <nirbhay@mariadb.com>2015-05-14 21:53:48 -0400
committerNirbhay Choubey <nirbhay@mariadb.com>2015-05-14 21:53:48 -0400
commit3eb8bc01b6876dc9dbacb82179127a58f4b86e79 (patch)
treea550a3f9f4754201613e9fdfd48d41e24590e252
parent14b816a5c8899e9c7cbccf7dd394032af0896223 (diff)
parent8fdf8f00c714471d499c0e9206940f3f2e8a22f3 (diff)
downloadmariadb-git-3eb8bc01b6876dc9dbacb82179127a58f4b86e79.tar.gz
Merge branch '5.5-galera' into 10.0-galeramariadb-galera-10.0.19
-rw-r--r--scripts/wsrep_sst_xtrabackup-v2.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/wsrep_sst_xtrabackup-v2.sh b/scripts/wsrep_sst_xtrabackup-v2.sh
index c6bfc86a74a..71e25f0d57c 100644
--- a/scripts/wsrep_sst_xtrabackup-v2.sh
+++ b/scripts/wsrep_sst_xtrabackup-v2.sh
@@ -550,7 +550,7 @@ setup_ports
get_stream
get_transfer
-if ${INNOBACKUPEX_BIN} /tmp --help | grep -q -- '--version-check'; then
+if ${INNOBACKUPEX_BIN} /tmp --help | grep -- '--version-check' >/dev/null ; then
disver="--no-version-check"
fi