diff --git a/Documentation/Release-Notes/MaxScale-2.2.16-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.2.16-Release-Notes.md deleted file mode 100644 index aa3dd7509..000000000 --- a/Documentation/Release-Notes/MaxScale-2.2.16-Release-Notes.md +++ /dev/null @@ -1,40 +0,0 @@ -# MariaDB MaxScale 2.2.16 Release Notes - -Release 2.2.16 is a GA release. - -This document describes the changes in release 2.2.16, when compared to the -previous release in the same series. - -For any problems you encounter, please consider submitting a bug -report on [our Jira](https://jira.mariadb.org/projects/MXS). - -## Bug fixes - -* [MXS-2119](https://jira.mariadb.org/browse/MXS-2119) Files and directories are created with wrong permissions -* [MXS-2117](https://jira.mariadb.org/browse/MXS-2117) Old style queries aren't used when MDEV-13453 is encountered -* [MXS-2115](https://jira.mariadb.org/browse/MXS-2115) Automatic version detection doesn't work -* [MXS-2111](https://jira.mariadb.org/browse/MXS-2111) After SET PASSWORD done on the database, MaxScale not able to connect -* [MXS-2108](https://jira.mariadb.org/browse/MXS-2108) Session not immediately closed when all connections are lost -* [MXS-2103](https://jira.mariadb.org/browse/MXS-2103) ReadWriteSplit, SELECT on fully qualified temporary table is wrongly routed to Slave -* [MXS-2073](https://jira.mariadb.org/browse/MXS-2073) TCP_NODELAY not enabled for client socket -* [MXS-2049](https://jira.mariadb.org/browse/MXS-2049) Kerberos authentication not working or not clearly documented - -## Known Issues and Limitations - -There are some limitations and known issues within this version of MaxScale. -For more information, please refer to the [Limitations](../About/Limitations.md) document. - -## Packaging - -RPM and Debian packages are provided for supported the Linux distributions. - -Packages can be downloaded [here](https://mariadb.com/downloads/mariadb-tx/maxscale). - -## Source Code - -The source code of MaxScale is tagged at GitHub with a tag, which is identical -with the version of MaxScale. For instance, the tag of version X.Y.Z of MaxScale -is `maxscale-X.Y.Z`. Further, the default branch is always the latest GA version -of MaxScale. - -The source code is available [here](https://github.com/mariadb-corporation/MaxScale). 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") diff --git a/server/modules/monitor/galeramon/galeramon.cc b/server/modules/monitor/galeramon/galeramon.cc index 4e5253d24..f393c3891 100644 --- a/server/modules/monitor/galeramon/galeramon.cc +++ b/server/modules/monitor/galeramon/galeramon.cc @@ -355,6 +355,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); }