summaryrefslogtreecommitdiff
path: root/scripts/wsrep_sst_common.sh
diff options
context:
space:
mode:
authorJan Lindström <jan.lindstrom@mariadb.com>2021-06-22 15:44:44 +0300
committerJulius Goryavsky <julius.goryavsky@mariadb.com>2021-06-25 21:23:04 +0200
commit1c03e7a66741a840ea39939853a774d93d3d4704 (patch)
tree36ee08d93ea5c577b4ba74fe36c3e21269696991 /scripts/wsrep_sst_common.sh
parent09b03ff31b8fd71aee265c22479613a28879f3b9 (diff)
downloadmariadb-git-1c03e7a66741a840ea39939853a774d93d3d4704.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/wsrep_sst_common.sh')
-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