revision-id: 80a6fed27012ec4202cb2c6fb4591421197f3be5 (mariadb-10.1.35-26-g80a6fed2701) parent(s): fc60c905dfa0170975f8fb4d681e77b2efcc29ca author: Jan Lindström committer: Jan Lindström timestamp: 2018-09-04 10:58:43 +0300 message: Fix warnings and style error. --- scripts/wsrep_sst_rsync.sh | 2 ++ sql/wsrep_sst.cc | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/wsrep_sst_rsync.sh b/scripts/wsrep_sst_rsync.sh index 35df0c86e23..c01e7c1d390 100644 --- a/scripts/wsrep_sst_rsync.sh +++ b/scripts/wsrep_sst_rsync.sh @@ -105,6 +105,8 @@ if ! [ -z $WSREP_SST_OPT_BINLOG ] then BINLOG_DIRNAME=$(dirname $WSREP_SST_OPT_BINLOG) BINLOG_FILENAME=$(basename $WSREP_SST_OPT_BINLOG) + BINLOG_INDEX_DIRNAME=$(dirname $WSREP_SST_OPT_BINLOG) + BINLOG_INDEX_FILENAME=$(basename $WSREP_SST_OPT_BINLOG) fi if ! [ -z $WSREP_SST_OPT_BINLOG_INDEX ] diff --git a/sql/wsrep_sst.cc b/sql/wsrep_sst.cc index 6a958bd4c76..0b909a95b00 100644 --- a/sql/wsrep_sst.cc +++ b/sql/wsrep_sst.cc @@ -630,7 +630,7 @@ static ssize_t sst_prepare_other (const char* method, } if (strlen(binlog_opt_val)) binlog_opt= WSREP_SST_OPT_BINLOG; - if (strlen(binlog_index_opt_val)) binlog_index_opt=WSREP_SST_OPT_BINLOG_INDEX; + if (strlen(binlog_index_opt_val)) binlog_index_opt= WSREP_SST_OPT_BINLOG_INDEX; make_wsrep_defaults_file();