From f7090df712d56148e5c7e3c72b9aee0e50525350 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Tue, 24 Oct 2017 20:59:54 +0200
Subject: MDEV-13968 sst fails with "WSREP_SST_OPT_PORT: readonly variable"

followup for 4c2c057d404

fix broken script (set -u)
---
 scripts/wsrep_sst_common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'scripts')

diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh
index 3ffaf8b10ef..9b09935abbf 100644
--- a/scripts/wsrep_sst_common.sh
+++ b/scripts/wsrep_sst_common.sh
@@ -124,8 +124,8 @@ readonly WSREP_SST_OPT_BYPASS
 readonly WSREP_SST_OPT_BINLOG
 readonly WSREP_SST_OPT_CONF_SUFFIX
 
-if [ -n "$WSREP_SST_OPT_ADDR_PORT" ]; then
-  if [ -n "$WSREP_SST_OPT_PORT" ]; then
+if [ -n "${WSREP_SST_OPT_ADDR_PORT:-}" ]; then
+  if [ -n "${WSREP_SST_OPT_PORT:-}" ]; then
     if [ "$WSREP_SST_OPT_PORT" != "$WSREP_SST_OPT_ADDR_PORT" ]; then
       wsrep_log_error "port in --port=$WSREP_SST_OPT_PORT differs from port in --address=$WSREP_SST_OPT_ADDR"
       exit 2
-- 
cgit v1.2.1