From e1dedfb678ee83a55c1461e369ae471fa4d34729 Mon Sep 17 00:00:00 2001 From: Toni Zlomislic Date: Wed, 31 Oct 2018 15:00:26 +0100 Subject: [PATCH 1/3] Update galeramon.c (#183) * Update galeramon.c support wsrep_sst_method "xtrabackup-v2" for available_when_donor maxscale option * reformat line to fit <=110 chars / support xtrabackup-v2 sst method --- server/modules/monitor/galeramon/galeramon.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server/modules/monitor/galeramon/galeramon.c b/server/modules/monitor/galeramon/galeramon.c index ab8c5bc19..6e942dd55 100644 --- a/server/modules/monitor/galeramon/galeramon.c +++ b/server/modules/monitor/galeramon/galeramon.c @@ -285,6 +285,10 @@ static bool using_xtrabackup(MXS_MONITORED_SERVER *database, const char* server_ { rval = true; } + else if (row[1] && (strcmp(row[1], "xtrabackup-v2") == 0)) + { + rval = true; + } } mysql_free_result(result); } From 0e718d120755aa398a1a37b1c73d6f1990d62117 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 1 Nov 2018 10:34:07 +0200 Subject: [PATCH 2/3] Update release date --- Documentation/Release-Notes/MaxScale-2.2.16-Release-Notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Release-Notes/MaxScale-2.2.16-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.2.16-Release-Notes.md index aa3dd7509..23c22cb81 100644 --- a/Documentation/Release-Notes/MaxScale-2.2.16-Release-Notes.md +++ b/Documentation/Release-Notes/MaxScale-2.2.16-Release-Notes.md @@ -1,4 +1,4 @@ -# MariaDB MaxScale 2.2.16 Release Notes +# MariaDB MaxScale 2.2.16 Release Notes -- 2018-11-01 Release 2.2.16 is a GA release. From 0b23ee78e56a18dcc89ca8819657aa57a15e3eb0 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 1 Nov 2018 10:45:00 +0200 Subject: [PATCH 3/3] Update maintenance version number --- VERSION22.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION22.cmake b/VERSION22.cmake index 2090185d0..9dede9551 100644 --- a/VERSION22.cmake +++ b/VERSION22.cmake @@ -5,7 +5,7 @@ set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version") set(MAXSCALE_VERSION_MINOR "2" CACHE STRING "Minor version") -set(MAXSCALE_VERSION_PATCH "16" CACHE STRING "Patch version") +set(MAXSCALE_VERSION_PATCH "17" CACHE STRING "Patch version") # This should only be incremented if a package is rebuilt set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")