MDEV-13968 sst fails with "WSREP_SST_OPT_PORT: readonly variable"

followup for 990c431 fix broken script (set -u)
MariaDB · May 14, 2018 · fe3c4a4 · fe3c4a4
1 parent e6b31df
commit fe3c4a4
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh
@@ -129,8 +129,8 @@ done
 readonly WSREP_SST_OPT_BYPASS
 readonly WSREP_SST_OPT_BINLOG
 
-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