diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-09-23 20:26:35 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-09-24 11:46:08 +0200 |
| commit | 5ae8fce50bb5cbd7916acd6b03bd699f79c10616 (patch) | |
| tree | 6291ec25e408ea225531e8b79a4f4fd7f3a81329 /scripts | |
| parent | 76098f45b8b1f2224eb25cf5d94450c6f4a1414c (diff) | |
| parent | 1fc5a6f30c3a9c047dcf9a36b00026d98f286f6b (diff) | |
| download | mariadb-git-5ae8fce50bb5cbd7916acd6b03bd699f79c10616.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'scripts')
| -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 c039c2850f0..dba749e453b 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') |