From c592328ea2cc393a18ec04de0bb7c45935f542ea Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Tue, 30 Jul 2019 12:29:01 +0300 Subject: [PATCH 1/4] MXS-2613 Access correct argument The cache show-command accessed the wrong argument. That is why [maxadmin|maxctrl] call command cache show TheCache did not work. --- server/modules/filter/cache/cachefilter.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/modules/filter/cache/cachefilter.cc b/server/modules/filter/cache/cachefilter.cc index ed6b31e4d..0a20f046e 100644 --- a/server/modules/filter/cache/cachefilter.cc +++ b/server/modules/filter/cache/cachefilter.cc @@ -94,9 +94,9 @@ void cache_config_reset(CACHE_CONFIG& config) bool cache_command_show(const MODULECMD_ARG* pArgs, json_t** output) { mxb_assert(pArgs->argc == 1); - mxb_assert(MODULECMD_GET_TYPE(&pArgs->argv[1].type) == MODULECMD_ARG_FILTER); + mxb_assert(MODULECMD_GET_TYPE(&pArgs->argv[0].type) == MODULECMD_ARG_FILTER); - const MXS_FILTER_DEF* pFilterDef = pArgs->argv[1].value.filter; + const MXS_FILTER_DEF* pFilterDef = pArgs->argv[0].value.filter; mxb_assert(pFilterDef); CacheFilter* pFilter = reinterpret_cast(filter_def_get_instance(pFilterDef)); From 18169a17d9759a85a99d9dc6be28fab1cf3c39d5 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 1 Aug 2019 08:23:39 +0300 Subject: [PATCH 2/4] Update 2.3 changelog and add 2.3.10 release notes --- Documentation/Changelog.md | 1 + .../MaxScale-2.3.10-Release-Notes.md | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 Documentation/Release-Notes/MaxScale-2.3.10-Release-Notes.md diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md index e5160d7ae..bf171504f 100644 --- a/Documentation/Changelog.md +++ b/Documentation/Changelog.md @@ -31,6 +31,7 @@ For more details, please refer to: +* [MariaDB MaxScale 2.3.10 Release Notes](Release-Notes/MaxScale-2.3.10-Release-Notes.md) * [MariaDB MaxScale 2.3.9 Release Notes](Release-Notes/MaxScale-2.3.9-Release-Notes.md) * [MariaDB MaxScale 2.3.8 Release Notes](Release-Notes/MaxScale-2.3.8-Release-Notes.md) * [MariaDB MaxScale 2.3.7 Release Notes](Release-Notes/MaxScale-2.3.7-Release-Notes.md) diff --git a/Documentation/Release-Notes/MaxScale-2.3.10-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.3.10-Release-Notes.md new file mode 100644 index 000000000..b675b27dd --- /dev/null +++ b/Documentation/Release-Notes/MaxScale-2.3.10-Release-Notes.md @@ -0,0 +1,49 @@ +# MariaDB MaxScale 2.3.10 Release Notes + +Release 2.3.10 is a GA release. + +This document describes the changes in release 2.3.10, 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-2613](https://jira.mariadb.org/browse/MXS-2613) Fix cachefilter diagnostics +* [MXS-2607](https://jira.mariadb.org/browse/MXS-2607) Unexpected trailing spaces with --tsv option in MaxCtrl +* [MXS-2606](https://jira.mariadb.org/browse/MXS-2606) Users are loaded from the first available server +* [MXS-2605](https://jira.mariadb.org/browse/MXS-2605) debug assert at readwritesplit.cc:418 failed: a.second.total == a.second.read + a.second.write +* [MXS-2598](https://jira.mariadb.org/browse/MXS-2598) memory leak on handling COM_CHANGE_USER +* [MXS-2597](https://jira.mariadb.org/browse/MXS-2597) MaxScale doesn't handle errors from microhttpd +* [MXS-2594](https://jira.mariadb.org/browse/MXS-2594) Enabling use_priority for not set priority on server level triggers an election +* [MXS-2587](https://jira.mariadb.org/browse/MXS-2587) mxs1507_trx_replay: debug assert in routeQuery +* [MXS-2586](https://jira.mariadb.org/browse/MXS-2586) user_refresh_time default value is wrong +* [MXS-2559](https://jira.mariadb.org/browse/MXS-2559) Log doesn't tell from which server users are loaded from +* [MXS-2520](https://jira.mariadb.org/browse/MXS-2520) Readwritesplit won't connect to master for reads +* [MXS-2502](https://jira.mariadb.org/browse/MXS-2502) Specifying 'information_schema' as default schema upon connection gives 'access denied' +* [MXS-2490](https://jira.mariadb.org/browse/MXS-2490) Unknown prepared statement handler (0) given to mysqld_stmt_execute +* [MXS-2486](https://jira.mariadb.org/browse/MXS-2486) MaxScale 2.3.6 received fatal signal 11 +* [MXS-2449](https://jira.mariadb.org/browse/MXS-2449) Maxadmin shows wrong monitor status +* [MXS-2261](https://jira.mariadb.org/browse/MXS-2261) maxkeys overwrites existing key without warning +* [MXS-1901](https://jira.mariadb.org/browse/MXS-1901) Multi continues COM_STMT_SEND_LONG_DATA route to different backends + +## 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_platform-mariadb_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). From 8347a48b644dd00cbae7e9bb1c9c5805d8990052 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 1 Aug 2019 08:32:30 +0300 Subject: [PATCH 3/4] Update 2.3 maintance release --- VERSION23.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION23.cmake b/VERSION23.cmake index afc3c44fc..2f928171c 100644 --- a/VERSION23.cmake +++ b/VERSION23.cmake @@ -5,7 +5,7 @@ set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version") set(MAXSCALE_VERSION_MINOR "3" CACHE STRING "Minor version") -set(MAXSCALE_VERSION_PATCH "10" CACHE STRING "Patch version") +set(MAXSCALE_VERSION_PATCH "11" CACHE STRING "Patch version") # This should only be incremented if a package is rebuilt set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number") From e1a730ed869d3f29b34a5c6ef3468ab667b95595 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Thu, 1 Aug 2019 16:06:26 +0300 Subject: [PATCH 4/4] Update release date for 2.3.10 --- Documentation/Release-Notes/MaxScale-2.3.10-Release-Notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/Release-Notes/MaxScale-2.3.10-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.3.10-Release-Notes.md index b675b27dd..c8a0fed77 100644 --- a/Documentation/Release-Notes/MaxScale-2.3.10-Release-Notes.md +++ b/Documentation/Release-Notes/MaxScale-2.3.10-Release-Notes.md @@ -1,4 +1,4 @@ -# MariaDB MaxScale 2.3.10 Release Notes +# MariaDB MaxScale 2.3.10 Release Notes -- 2019-08-01 Release 2.3.10 is a GA release.