diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-10-24 20:59:54 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-10-25 01:03:19 +0200 |
| commit | f7090df712d56148e5c7e3c72b9aee0e50525350 (patch) | |
| tree | 36e4bdbbf5e0cdf36d27a61de9b1a870fd649c97 /scripts/wsrep_sst_common.sh | |
| parent | 24bffb080bd0673146b79fe95a65febc2648bba3 (diff) | |
| download | mariadb-git-f7090df712d56148e5c7e3c72b9aee0e50525350.tar.gz | |
MDEV-13968 sst fails with "WSREP_SST_OPT_PORT: readonly variable"
followup for 4c2c057d404
fix broken script (set -u)
Diffstat (limited to 'scripts/wsrep_sst_common.sh')
| -rw-r--r-- | scripts/wsrep_sst_common.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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 |