Merge branch '2.2' into develop

This commit is contained in:
Markus Mäkelä
2018-09-12 22:14:56 +03:00
21 changed files with 254 additions and 105 deletions

View File

@ -2,8 +2,8 @@
Release 2.2.14 is a GA release.
This document describes the changes in release 2.2.14, when compared to the
previous release in the same series.
This document describes the changes in release 2.2.14, when compared to
release 2.2.13.
For any problems you encounter, please consider submitting a bug
report on [our Jira](https://jira.mariadb.org/projects/MXS).
@ -14,7 +14,10 @@ report on [our Jira](https://jira.mariadb.org/projects/MXS).
## Bug fixes
* [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-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-2034](https://jira.mariadb.org/browse/MXS-2034) query_retry_timeout was not set
* [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

View File

@ -1,11 +1,11 @@
#!/bin/bash
major=`cmake -P ../../VERSION.cmake -L|grep 'MAXSCALE_VERSION_MAJOR'|sed 's/.*=//'`
minor=`cmake -P ../../VERSION.cmake -L|grep 'MAXSCALE_VERSION_MINOR'|sed 's/.*=//'`
patch=`cmake -P ../../VERSION.cmake -L|grep 'MAXSCALE_VERSION_PATCH'|sed 's/.*=//'`
maturity=`cmake -P ../../VERSION.cmake -L|grep 'MAXSCALE_MATURITY'|sed 's/.*=//'`
major="`cd ../../ && cmake -P ./VERSION.cmake -L|grep 'MAXSCALE_VERSION_MAJOR'|sed 's/.*=//'`"
minor="`cd ../../ && cmake -P ./VERSION.cmake -L|grep 'MAXSCALE_VERSION_MINOR'|sed 's/.*=//'`"
patch="`cd ../../ && cmake -P ./VERSION.cmake -L|grep 'MAXSCALE_VERSION_PATCH'|sed 's/.*=//'`"
maturity="`cd ../../ && cmake -P ./VERSION.cmake -L|grep 'MAXSCALE_MATURITY'|sed 's/.*=//'`"
VERSION=${major}.${minor}.${patch}
VERSION="${major}.${minor}.${patch}"
cat <<EOF > MaxScale-$VERSION-Release-Notes.md
# MariaDB MaxScale ${VERSION} Release Notes