Skip to content

Commit 58700a4

Browse files
committed
MDEV-26019: Upgrading MariaDB breaks TLS mariabackup SST
Fixed typo in variable name that breaks SST in some scenatios. Also fixed one small inaccuracy after MDEV-25978 which leads to the use of an uninitialized variable when the --log-bin option is specified without an argument.
1 parent 1c03e7a commit 58700a4

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

scripts/wsrep_sst_common.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ if [ -n "${MYSQLD_OPT_LOG_BASENAME:-}" -a \
456456
fi
457457

458458
# If the --log-bin option is present without a value, then
459-
# setting WSREP_SST_OPT_BINLOG by using other arguments:
459+
# set WSREP_SST_OPT_BINLOG value using other arguments:
460460
if [ -z "$WSREP_SST_OPT_BINLOG" -a -n "${MYSQLD_OPT_LOG_BIN+x}" ]; then
461461
if [ -n "$WSREP_SST_OPT_LOG_BASENAME" ]; then
462462
# If the WSREP_SST_OPT_BINLOG variable is not set, but
@@ -465,9 +465,8 @@ if [ -z "$WSREP_SST_OPT_BINLOG" -a -n "${MYSQLD_OPT_LOG_BIN+x}" ]; then
465465
# the "-bin" suffix:
466466
readonly WSREP_SST_OPT_BINLOG="$WSREP_SST_OPT_LOG_BASENAME-bin"
467467
else
468-
# the default name, note that base of this name
469-
# is already defined above
470-
readonly WSREP_SST_OPT_BINLOG_INDEX="$WSREP_SST_OPT_BINLOG.index"
468+
# Take the default name:
469+
readonly WSREP_SST_OPT_BINLOG='mysql-bin'
471470
fi
472471
fi
473472

@@ -550,8 +549,8 @@ get_binlog()
550549
# the "-bin" suffix:
551550
readonly WSREP_SST_OPT_BINLOG_INDEX="$WSREP_SST_OPT_LOG_BASENAME-bin.index"
552551
else
553-
# the default name, note that base of this name
554-
# is already defined above
552+
# the default name (note that base of this name
553+
# is already defined above):
555554
readonly WSREP_SST_OPT_BINLOG_INDEX="$WSREP_SST_OPT_BINLOG.index"
556555
fi
557556
fi

scripts/wsrep_sst_mariabackup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ get_transfer()
386386
elif is_local_ip "$WSREP_SST_OPT_HOST_UNESCAPED"; then
387387
CN_option=',commonname=localhost'
388388
else
389-
CN_option=",commonname='$WSREP_SST_OPT_HOST_UNSECAPED'"
389+
CN_option=",commonname='$WSREP_SST_OPT_HOST_UNESCAPED'"
390390
fi
391391
tcmd="$tcmd,cert='$tpem',key='$tkey',cafile='$tcert'$CN_option$sockopt"
392392
wsrep_log_info "$action with cert=$tpem, key=$tkey, cafile=$tcert"

0 commit comments

Comments
 (0)