diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-11-14 07:22:25 +0800 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-03-23 17:40:09 +0100 |
| commit | d3681c18f96ebf9b66c7541459b2eb34a4827734 (patch) | |
| tree | 20ef454b08a30531edcabff67bdbd5ff812ad8e5 /scripts/wsrep_sst_common.sh | |
| parent | af86422f0881cbe6b21a62a3bb7bbd93f57599ed (diff) | |
| download | mariadb-git-d3681c18f96ebf9b66c7541459b2eb34a4827734.tar.gz | |
followup for 89b0d5cb6e3, backport 8c422bf48d7
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 db0543a4d0f..47d9021fe55 100644 --- a/scripts/wsrep_sst_common.sh +++ b/scripts/wsrep_sst_common.sh @@ -126,9 +126,9 @@ done readonly WSREP_SST_OPT_BYPASS readonly WSREP_SST_OPT_BINLOG -if [ -n "${WSREP_SST_OPT_ADDR_PORT:-}" ]; then +if [ -n "${WSREP_SST_OPT_ADDR:-}" ]; then if [ -n "${WSREP_SST_OPT_PORT:-}" ]; then - if [ "$WSREP_SST_OPT_PORT" != "$WSREP_SST_OPT_ADDR_PORT" ]; then + if [ -n "$WSREP_SST_OPT_ADDR_PORT" -a "$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 fi |