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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Johan Wikman
2018-09-17 13:02:53 +03:00
parent eeb61216de 81a18db18e
commit 3b78996c4c
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/Release-Notes/MaxScale-2.2.14-Release-Notes.md
View File

@ -1,9 +1,9 @@
# MariaDB MaxScale 2.2.14 Release Notes # MariaDB MaxScale 2.2.14 Release Notes -- 2018-09-17
Release 2.2.14 is a GA release. Release 2.2.14 is a GA release.
This document describes the changes in release 2.2.14, when compared to This document describes the changes in release 2.2.14, when compared to the
release 2.2.13. previous release in the same series.
For any problems you encounter, please consider submitting a bug For any problems you encounter, please consider submitting a bug
report on [our Jira](https://jira.mariadb.org/projects/MXS). report on [our Jira](https://jira.mariadb.org/projects/MXS).
@ -14,11 +14,15 @@ report on [our Jira](https://jira.mariadb.org/projects/MXS).
## Bug fixes ## Bug fixes
* [MXS-2046](https://jira.mariadb.org/browse/MXS-2046) Memory leak in binlog router
* [MXS-2042](https://jira.mariadb.org/browse/MXS-2042) Hang with multistatment queries
* [MXS-2041](https://jira.mariadb.org/browse/MXS-2041) Crash on failure to create schemarouter session * [MXS-2041](https://jira.mariadb.org/browse/MXS-2041) Crash on failure to create schemarouter session
* [MXS-2040](https://jira.mariadb.org/browse/MXS-2040) Default monitor timeouts are too short * [MXS-2040](https://jira.mariadb.org/browse/MXS-2040) Default monitor timeouts are too short
* [MXS-2037](https://jira.mariadb.org/browse/MXS-2037) % wildcards not working with source in Named Server Filter * [MXS-2037](https://jira.mariadb.org/browse/MXS-2037) % wildcards not working with source in Named Server Filter
* [MXS-2036](https://jira.mariadb.org/browse/MXS-2036) A slave with sql thread stopped causes wrong master after failover * [MXS-2036](https://jira.mariadb.org/browse/MXS-2036) A slave with sql thread stopped causes wrong master after failover
* [MXS-2035](https://jira.mariadb.org/browse/MXS-2035) available_when_donor don't working with mariabackup sst method
* [MXS-2034](https://jira.mariadb.org/browse/MXS-2034) query_retry_timeout was not set * [MXS-2034](https://jira.mariadb.org/browse/MXS-2034) query_retry_timeout was not set
* [MXS-2033](https://jira.mariadb.org/browse/MXS-2033) MASTER_SSL_KEY and MASTER_SSL_CERT should not be required
* [MXS-2027](https://jira.mariadb.org/browse/MXS-2027) LOAD DATA LOCAL INFILE is not ignored by protocol modules * [MXS-2027](https://jira.mariadb.org/browse/MXS-2027) LOAD DATA LOCAL INFILE is not ignored by protocol modules
* [MXS-2024](https://jira.mariadb.org/browse/MXS-2024) Crash in reauthenticate_client * [MXS-2024](https://jira.mariadb.org/browse/MXS-2024) Crash in reauthenticate_client
* [MXS-2019](https://jira.mariadb.org/browse/MXS-2019) All atexit handlers aren't called * [MXS-2019](https://jira.mariadb.org/browse/MXS-2019) All atexit handlers aren't called
@ -26,6 +30,7 @@ report on [our Jira](https://jira.mariadb.org/projects/MXS).
* [MXS-2007](https://jira.mariadb.org/browse/MXS-2007) Fatal: MaxScale 2.2.13 received fatal signal 11 (Aurora Monitor) * [MXS-2007](https://jira.mariadb.org/browse/MXS-2007) Fatal: MaxScale 2.2.13 received fatal signal 11 (Aurora Monitor)
* [MXS-1999](https://jira.mariadb.org/browse/MXS-1999) Invalid null relationship handling in REST API * [MXS-1999](https://jira.mariadb.org/browse/MXS-1999) Invalid null relationship handling in REST API
* [MXS-1996](https://jira.mariadb.org/browse/MXS-1996) Avrorouter writes misleading error messages to the log * [MXS-1996](https://jira.mariadb.org/browse/MXS-1996) Avrorouter writes misleading error messages to the log
* [MXS-1947](https://jira.mariadb.org/browse/MXS-1947) Composite roles are not supported
* [MXS-1880](https://jira.mariadb.org/browse/MXS-1880) MaxScale 2.2.5-1 Crashes after a non clean Start * [MXS-1880](https://jira.mariadb.org/browse/MXS-1880) MaxScale 2.2.5-1 Crashes after a non clean Start
* [MXS-1736](https://jira.mariadb.org/browse/MXS-1736) Clarify the usage of maxpasswd in documentation * [MXS-1736](https://jira.mariadb.org/browse/MXS-1736) Clarify the usage of maxpasswd in documentation
* [MXS-1735](https://jira.mariadb.org/browse/MXS-1735) Clarify SSL documentation * [MXS-1735](https://jira.mariadb.org/browse/MXS-1735) Clarify SSL documentation

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

@ -352,7 +352,7 @@ static bool using_xtrabackup(MXS_MONITORED_SERVER* database, const char* server_
while ((row = mysql_fetch_row(result))) while ((row = mysql_fetch_row(result)))
{ {
if (row[1] && (strcmp(row[1], "xtrabackup") == 0 || strcmp(row[1], "mariabackup"))) if (row[1] && (strcmp(row[1], "xtrabackup") == 0 || strcmp(row[1], "mariabackup") == 0))
{ {
rval = true; rval = true;
} }