revision-id: 5c662d7516da67f09e9edb9c3bb33125a0646511 (mariadb-25.3.19-19-g5c662d75) parent(s): c0f67cc18569a9f9b060b33094dba261202705da ddf9876eee60591c6ed1f00316fbf36bfe6d4984 author: Jan Lindström committer: Jan Lindström timestamp: 2018-11-28 14:13:09 +0200 message: Merge tag 'release_25.3.25' into mariadb-3.x SConstruct | 26 ++++++++-- galera/src/certification.cpp | 66 +++++++++++++++++++------ galera/src/certification.hpp | 5 +- galera/src/replicator_smm_params.cpp | 16 +++--- galerautils/src/gu_asio.cpp | 20 +++++++- galerautils/src/gu_digest.hpp | 1 - galerautils/src/gu_utils.c | 21 ++++---- galerautils/src/gu_vec16.h | 96 ------------------------------------ galerautils/tests/SConscript | 1 - galerautils/tests/gu_tests.c | 2 - galerautils/tests/gu_vec_test.c | 53 -------------------- galerautils/tests/gu_vec_test.h | 12 ----- scripts/build.sh | 2 +- scripts/mysql/build.sh | 2 + 14 files changed, 118 insertions(+), 205 deletions(-) diff --cc scripts/build.sh index 5e53720c,d4c18bbe..43a223a5 --- a/scripts/build.sh +++ b/scripts/build.sh @@@ -4,9 -4,6 +4,9 @@@ set -e # $Id$ +# Galera library version - VERSION="25.3.24" ++VERSION="25.3.25" + get_cores() { case $OS in