diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md index 9ad2c4348..faa61c742 100644 --- a/Documentation/Changelog.md +++ b/Documentation/Changelog.md @@ -21,6 +21,7 @@ * MaxScale now supports IPv6 For more details, please refer to: +* [MariaDB MaxScale 2.1.10 Release Notes](Release-Notes/MaxScale-2.1.10-Release-Notes.md) * [MariaDB MaxScale 2.1.9 Release Notes](Release-Notes/MaxScale-2.1.9-Release-Notes.md) * [MariaDB MaxScale 2.1.8 Release Notes](Release-Notes/MaxScale-2.1.8-Release-Notes.md) * [MariaDB MaxScale 2.1.7 Release Notes](Release-Notes/MaxScale-2.1.7-Release-Notes.md) diff --git a/Documentation/Filters/Database-Firewall-Filter.md b/Documentation/Filters/Database-Firewall-Filter.md index 3b43160f3..228c2c410 100644 --- a/Documentation/Filters/Database-Firewall-Filter.md +++ b/Documentation/Filters/Database-Firewall-Filter.md @@ -51,13 +51,14 @@ all matching queries, or `ignore` which allows all queries to proceed. The following statement types will always be allowed through when `action` is set to `allow`: - - COM_QUIT: Client closes connection - - COM_PING: Server is pinged - COM_CHANGE_USER: The user is changed for an active connection - - COM_SET_OPTION: Client multi-statements are being configured - COM_FIELD_LIST: Alias for the `SHOW TABLES;` query - - COM_PROCESS_KILL: Alias for `KILL ;` query + - COM_INIT_DB: Alias for `USE ;` + - COM_PING: Server is pinged - COM_PROCESS_INFO: Alias for `SHOW PROCESSLIST;` + - COM_PROCESS_KILL: Alias for `KILL ;` query + - COM_QUIT: Client closes connection + - COM_SET_OPTION: Client multi-statements are being configured You can have both blacklist and whitelist functionality by configuring one filter with `action=allow` and another one with `action=block`. You can then use diff --git a/Documentation/Release-Notes/MaxScale-2.1.10-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.1.10-Release-Notes.md new file mode 100644 index 000000000..49f3c4660 --- /dev/null +++ b/Documentation/Release-Notes/MaxScale-2.1.10-Release-Notes.md @@ -0,0 +1,47 @@ +# MariaDB MaxScale 2.1.10 Release Notes + +Release 2.1.10 is a GA release. + +This document describes the changes in release 2.1.10, when compared +to release [2.1.9](MaxScale-2.1.9-Release-Notes.md). + +If you are upgrading from release 2.0, please also read the following +release notes: + +* [2.1.9](./MaxScale-2.1.9-Release-Notes.md) +* [2.1.8](./MaxScale-2.1.8-Release-Notes.md) +* [2.1.7](./MaxScale-2.1.7-Release-Notes.md) +* [2.1.6](./MaxScale-2.1.6-Release-Notes.md) +* [2.1.5](./MaxScale-2.1.5-Release-Notes.md) +* [2.1.4](./MaxScale-2.1.4-Release-Notes.md) +* [2.1.3](./MaxScale-2.1.3-Release-Notes.md) +* [2.1.2](./MaxScale-2.1.2-Release-Notes.md) +* [2.1.1](./MaxScale-2.1.1-Release-Notes.md) +* [2.1.0](./MaxScale-2.1.0-Release-Notes.md) + +For any problems you encounter, please consider submitting a bug report at +[Jira](https://jira.mariadb.org). + +## Bug fixes + +[Here is a list of bugs fixed in MaxScale 2.1.10.](https://jira.mariadb.org/issues/?jql=project%20%3D%20MXS%20AND%20issuetype%20%3D%20Bug%20AND%20status%20%3D%20Closed%20AND%20fixVersion%20%3D%202.1.10) + +* [MXS-1456](https://jira.mariadb.org/browse/MXS-1456) OOM when script variable is empty +* [MXS-1451](https://jira.mariadb.org/browse/MXS-1451) Password is not stored with skip_authentication=true +* [MXS-1450](https://jira.mariadb.org/browse/MXS-1450) Maxadmin commands with a leading space are silently ignored +* [MXS-1449](https://jira.mariadb.org/browse/MXS-1449) Database change not allowed + +## Packaging + +RPM and Debian packages are provided for the Linux distributions supported by +MariaDB Enterprise. + +Packages can be downloaded [here](https://mariadb.com/resources/downloads). + +## 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. + +The source code is available [here](https://github.com/mariadb-corporation/MaxScale). diff --git a/Documentation/Upgrading/Upgrading-To-MaxScale-2.1.md b/Documentation/Upgrading/Upgrading-To-MaxScale-2.1.md index a8095ec1f..e311e047e 100644 --- a/Documentation/Upgrading/Upgrading-To-MaxScale-2.1.md +++ b/Documentation/Upgrading/Upgrading-To-MaxScale-2.1.md @@ -7,16 +7,17 @@ For more information about MariaDB MaxScale 2.1, please refer to the [ChangeLog](../Changelog.md). For a complete list of changes in MaxScale 2.1, refer to the -[MaxScale 2.1.9 Release Notes](../Release-Notes/MaxScale-2.1.9-Release-Notes.md). -[MaxScale 2.1.8 Release Notes](../Release-Notes/MaxScale-2.1.8-Release-Notes.md). -[MaxScale 2.1.7 Release Notes](../Release-Notes/MaxScale-2.1.7-Release-Notes.md). -[MaxScale 2.1.6 Release Notes](../Release-Notes/MaxScale-2.1.6-Release-Notes.md). -[MaxScale 2.1.5 Release Notes](../Release-Notes/MaxScale-2.1.5-Release-Notes.md). -[MaxScale 2.1.4 Release Notes](../Release-Notes/MaxScale-2.1.4-Release-Notes.md). -[MaxScale 2.1.3 Release Notes](../Release-Notes/MaxScale-2.1.3-Release-Notes.md). -[MaxScale 2.1.2 Release Notes](../Release-Notes/MaxScale-2.1.2-Release-Notes.md). -[MaxScale 2.1.1 Release Notes](../Release-Notes/MaxScale-2.1.1-Release-Notes.md). -[MaxScale 2.1.0 Release Notes](../Release-Notes/MaxScale-2.1.0-Release-Notes.md). +* [MaxScale 2.1.10 Release Notes](../Release-Notes/MaxScale-2.1.10-Release-Notes.md) +* [MaxScale 2.1.9 Release Notes](../Release-Notes/MaxScale-2.1.9-Release-Notes.md). +* [MaxScale 2.1.8 Release Notes](../Release-Notes/MaxScale-2.1.8-Release-Notes.md). +* [MaxScale 2.1.7 Release Notes](../Release-Notes/MaxScale-2.1.7-Release-Notes.md). +* [MaxScale 2.1.6 Release Notes](../Release-Notes/MaxScale-2.1.6-Release-Notes.md). +* [MaxScale 2.1.5 Release Notes](../Release-Notes/MaxScale-2.1.5-Release-Notes.md). +* [MaxScale 2.1.4 Release Notes](../Release-Notes/MaxScale-2.1.4-Release-Notes.md). +* [MaxScale 2.1.3 Release Notes](../Release-Notes/MaxScale-2.1.3-Release-Notes.md). +* [MaxScale 2.1.2 Release Notes](../Release-Notes/MaxScale-2.1.2-Release-Notes.md). +* [MaxScale 2.1.1 Release Notes](../Release-Notes/MaxScale-2.1.1-Release-Notes.md). +* [MaxScale 2.1.0 Release Notes](../Release-Notes/MaxScale-2.1.0-Release-Notes.md). ## Installation diff --git a/server/core/externcmd.cc b/server/core/externcmd.cc index 22cfe791c..8ea736b71 100644 --- a/server/core/externcmd.cc +++ b/server/core/externcmd.cc @@ -381,6 +381,7 @@ bool externcmd_substitute_arg(EXTERNCMD* cmd, const char* match, const char* rep if (dest) { mxs_pcre2_result_t rc = mxs_pcre2_substitute(re, cmd->argv[i], replace, &dest, &size); + switch (rc) { case MXS_PCRE2_ERROR: diff --git a/server/modules/filter/dbfwfilter/dbfwfilter.cc b/server/modules/filter/dbfwfilter/dbfwfilter.cc index 637e7542b..8dc586074 100644 --- a/server/modules/filter/dbfwfilter/dbfwfilter.cc +++ b/server/modules/filter/dbfwfilter/dbfwfilter.cc @@ -1279,13 +1279,14 @@ static bool command_is_mandatory(const GWBUF *buffer) { switch (MYSQL_GET_COMMAND((uint8_t*)GWBUF_DATA(buffer))) { - case MXS_COM_QUIT: - case MXS_COM_PING: case MXS_COM_CHANGE_USER: - case MXS_COM_SET_OPTION: case MXS_COM_FIELD_LIST: - case MXS_COM_PROCESS_KILL: + case MXS_COM_INIT_DB: + case MXS_COM_PING: case MXS_COM_PROCESS_INFO: + case MXS_COM_PROCESS_KILL: + case MXS_COM_QUIT: + case MXS_COM_SET_OPTION: return true; default: