diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-09-13 08:29:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-13 08:29:41 +0300 |
| commit | ec457c08d76339c53b264ea4bcff3fd3c2239558 (patch) | |
| tree | 2bbf10ac941c8de6ab8078e031e1c2ecc6fcdece | |
| parent | 6c7910ee221c7ceb3826088b3f00ea95ba3b93ba (diff) | |
| parent | b96d36344ef0d2ee76722299dfc30775f0d6d54a (diff) | |
| download | mariadb-git-ec457c08d76339c53b264ea4bcff3fd3c2239558.tar.gz | |
Merge pull request #865 from grooverdan/MDEV-17173-wsrep_sst
MDEV-17173: correct parsing of 12.13.14.15:4444/xtrabackup_sst leavin…
| -rw-r--r-- | scripts/wsrep_sst_common.sh | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh index b3969af10a2..e63ffdfa58b 100644 --- a/scripts/wsrep_sst_common.sh +++ b/scripts/wsrep_sst_common.sh @@ -57,9 +57,18 @@ case "$1" in readonly WSREP_SST_OPT_MODULE=${remain%%/*} readonly WSREP_SST_OPT_PATH=${WSREP_SST_OPT_ADDR#*/} remain=${WSREP_SST_OPT_PATH#*/} - readonly WSREP_SST_OPT_LSN=${remain%%/*} - remain=${remain#*/} - readonly WSREP_SST_OPT_SST_VER=${remain%%/*} + if [ "$remain" != "${WSREP_SST_OPT_PATH}" ]; then + readonly WSREP_SST_OPT_LSN=${remain%%/*} + remain=${remain#*/} + if [ "$remain" != "${WSREP_SST_OPT_LSN}" ]; then + readonly WSREP_SST_OPT_SST_VER=${remain%%/*} + else + readonly WSREP_SST_OPT_SST_VER="" + fi + else + readonly WSREP_SST_OPT_LSN="" + readonly WSREP_SST_OPT_SST_VER="" + fi shift ;; '--bypass') |