summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2021-06-22 15:44:44 +0300
committerJan Lindström <jan.lindstrom@mariadb.com>2021-06-23 08:11:05 +0300
commit9258cfa4b469ab0d841e32ced7e501e04043637f (patch)
tree0a68f065ac8d68b4e6b2111045bbba3c12cf92c3 /scripts
parent83464029cec28b4463309e18fa85974798719932 (diff)
downloadmariadb-git-9258cfa4b469ab0d841e32ced7e501e04043637f.tar.gz
MDEV-25978 : rsync SST does not work with custom binlog name
wsrep_sst_common did not correctly set name for binlog index file if custom binlog name was used and this name was not added to script command line. Added test case for both log_basename and log_binlog.
Diffstat (limited to 'scripts')
-rw-r--r--scripts/wsrep_sst_common.sh11
1 files changed, 6 insertions, 5 deletions
diff --git a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh
index 4dedecb439f..bb9a3b9f1b6 100644
--- a/scripts/wsrep_sst_common.sh
+++ b/scripts/wsrep_sst_common.sh
@@ -465,8 +465,9 @@ if [ -z "$WSREP_SST_OPT_BINLOG" -a -n "${MYSQLD_OPT_LOG_BIN+x}" ]; then
# the "-bin" suffix:
readonly WSREP_SST_OPT_BINLOG="$WSREP_SST_OPT_LOG_BASENAME-bin"
else
- # Take the default name:
- readonly WSREP_SST_OPT_BINLOG='mysql-bin'
+ # the default name, note that base of this name
+ # is already defined above
+ readonly WSREP_SST_OPT_BINLOG_INDEX="$WSREP_SST_OPT_BINLOG.index"
fi
fi
@@ -549,9 +550,9 @@ get_binlog()
# the "-bin" suffix:
readonly WSREP_SST_OPT_BINLOG_INDEX="$WSREP_SST_OPT_LOG_BASENAME-bin.index"
else
- # If the base name not specified, then we take
- # the default name:
- readonly WSREP_SST_OPT_BINLOG_INDEX='mysql-bin.index'
+ # the default name, note that base of this name
+ # is already defined above
+ readonly WSREP_SST_OPT_BINLOG_INDEX="$WSREP_SST_OPT_BINLOG.index"
fi
fi
fi