1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MDEV-13037: wsrep_sst_mysqldump checking wrong version of mysql client

Browse Source 
This happens because on line 59 of /usr/bin/wsrep_sst_mysqldump
we have a check :
   "if ! $MYSQL_CLIENT --version | grep 'Distrib 10.1' >/dev/null"
but the client is 10.2 so it doesnt match the grep expression.

Fixed check to be:
      "if ! $MYSQL_CLIENT --version | grep 'Distrib 10.' >/dev/null"
so that every 10. version is accepted.
This commit is contained in:
Jan Lindström 2017-08-09 12:47:12 +03:00
parent 6b14fd6d6d
commit 86f9b77147
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/wsrep_sst_mysqldump.sh
View File

@ -56,7 +56,7 @@ then
fi fi
# Check client version # Check client version
if ! $MYSQL_CLIENT --version | grep 'Distrib 10.1' >/dev/null if ! $MYSQL_CLIENT --version | grep 'Distrib 10.' >/dev/null
then then
$MYSQL_CLIENT --version >&2 $MYSQL_CLIENT --version >&2
wsrep_log_error "this operation requires MySQL client version 10 or newer" wsrep_log_error "this operation requires MySQL client version 10 or newer"
@ -133,7 +133,7 @@ SET_GTID_BINLOG_STATE=""
SQL_LOG_BIN_OFF="" SQL_LOG_BIN_OFF=""
# Safety check # Safety check
if echo $SERVER_VERSION | grep '^10.1' > /dev/null if echo $SERVER_VERSION | grep '^10.' > /dev/null
then then
# If binary logging is enabled on the joiner node, we need to copy donor's # If binary logging is enabled on the joiner node, we need to copy donor's
# gtid_binlog_state to joiner. In order to do that, a RESET MASTER must be # gtid_binlog_state to joiner. In order to do that, a RESET MASTER must be