summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2017-10-24 20:59:54 +0200
committerJan Lindström <jan.lindstrom@mariadb.com>2018-05-14 10:36:55 +0300
commitfe3c4a41829582f41f2db00cd410229dca2b6c38 (patch)
treefdcdcebf7f966d99d9ec8569d64052e3584cfa1f /scripts
parente6b31df6dfce1a412d20f32092da676768cff8ad (diff)
downloadmariadb-git-fe3c4a41829582f41f2db00cd410229dca2b6c38.tar.gz
MDEV-13968 sst fails with "WSREP_SST_OPT_PORT: readonly variable"
followup for 990c4318a779645ee fix broken script (set -u)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/wsrep_sst_common.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh
index bb91eeaeba2..c421bbfdc64 100644
--- 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