diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-09 12:47:12 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-09 12:47:12 +0300 |
| commit | 86f9b7714791f45f386e9aaa6f469ada626cd69d (patch) | |
| tree | f2b004ee79383c2ac09f0ec126e2a1f43d8b3955 /scripts | |
| parent | 6b14fd6d6d75e09b966ddb0750ccfbb94a74a909 (diff) | |
| download | mariadb-git-86f9b7714791f45f386e9aaa6f469ada626cd69d.tar.gz | |
MDEV-13037: wsrep_sst_mysqldump checking wrong version of mysql client
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.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/wsrep_sst_mysqldump.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/wsrep_sst_mysqldump.sh b/scripts/wsrep_sst_mysqldump.sh index 5f25c2c9d13..aaa82e1ed5c 100644 --- a/scripts/wsrep_sst_mysqldump.sh +++ b/scripts/wsrep_sst_mysqldump.sh @@ -56,7 +56,7 @@ then fi # Check client version -if ! $MYSQL_CLIENT --version | grep 'Distrib 10.1' >/dev/null +if ! $MYSQL_CLIENT --version | grep 'Distrib 10.' >/dev/null then $MYSQL_CLIENT --version >&2 wsrep_log_error "this operation requires MySQL client version 10 or newer" @@ -133,7 +133,7 @@ SET_GTID_BINLOG_STATE="" SQL_LOG_BIN_OFF="" # Safety check -if echo $SERVER_VERSION | grep '^10.1' > /dev/null +if echo $SERVER_VERSION | grep '^10.' > /dev/null then # 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 |