hcq/MaxScale
hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä 2018-11-27 11:46:47 +02:00
commit f87ff431c1
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
4 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/Changelog.md
View File

@ -62,6 +62,7 @@ For more details, please refer to:
the master. There is also limited capability for rejoining nodes.
For more details, please refer to:
* [MariaDB MaxScale 2.2.17 Release Notes](Release-Notes/MaxScale-2.2.17-Release-Notes.md)
* [MariaDB MaxScale 2.2.16 Release Notes](Release-Notes/MaxScale-2.2.16-Release-Notes.md)
* [MariaDB MaxScale 2.2.15 Release Notes](Release-Notes/MaxScale-2.2.15-Release-Notes.md)
* [MariaDB MaxScale 2.2.14 Release Notes](Release-Notes/MaxScale-2.2.14-Release-Notes.md)

38
Documentation/Release-Notes/MaxScale-2.2.17-Release-Notes.md Normal file
View File

@ -0,0 +1,38 @@
# MariaDB MaxScale 2.2.17 Release Notes
Release 2.2.17 is a GA release.
This document describes the changes in release 2.2.17, 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-2175](https://jira.mariadb.org/browse/MXS-2175) available_when_donor=true is not respected in Galera Monitor with xtrabackup-v2 sst method and only one synced node available in the cluster
* [MXS-2159](https://jira.mariadb.org/browse/MXS-2159) Oracle Connector/J 8.0 with SSL doesn't work with MaxScale
* [MXS-2151](https://jira.mariadb.org/browse/MXS-2151) MaxScale does not log any info when "Connection killed by MaxScale: Router could not recover from connection errors"
* [MXS-2106](https://jira.mariadb.org/browse/MXS-2106) Maxscale CDC JSON output does not respect null values
* [MXS-2095](https://jira.mariadb.org/browse/MXS-2095) Fatal: MaxScale 2.2.15 received fatal signal 11 - libavrorouter.so(count_columns+0x21)
* [MXS-2081](https://jira.mariadb.org/browse/MXS-2081) Unable to execute maxctrl commands in RHEL 6 - Maxscale 2.2.9
## 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).

2
VERSION22.cmake
View File

@ -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 "17" CACHE STRING "Patch version")
set(MAXSCALE_VERSION_PATCH "18" CACHE STRING "Patch version")
# This should only be incremented if a package is rebuilt
set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number")

15
server/modules/monitor/galeramon/galeramon.cc
View File

@ -208,22 +208,9 @@ void GaleraMonitor::update_server_status(MXS_MONITORED_SERVER* monitored_server)
info.local_state = atoi(row[1]);
}
/* We can check:
* wsrep_local_state == 0
* wsrep_cluster_size == 0
* wsrep_cluster_state_uuid == ""
*/
if (strcmp(row[0], "wsrep_cluster_state_uuid") == 0)
{
if (row[1] == NULL || !strlen(row[1]))
{
info.cluster_uuid.clear();
info.joined = 0;
}
else
{
info.cluster_uuid = MXS_STRDUP(row[1]);
}
info.cluster_uuid = row[1] && *row[1] ? MXS_STRDUP(row[1]) : NULL;
}
}