From da83115e6c9d52b641ff8b4d300cfc0a25acee40 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Mon, 19 Aug 2019 13:35:37 +0300 Subject: [PATCH 1/4] Update 2.4.1 release notes --- Documentation/Release-Notes/MaxScale-2.4.1-Release-Notes.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Documentation/Release-Notes/MaxScale-2.4.1-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.4.1-Release-Notes.md index 318f4528d..9bac87886 100644 --- a/Documentation/Release-Notes/MaxScale-2.4.1-Release-Notes.md +++ b/Documentation/Release-Notes/MaxScale-2.4.1-Release-Notes.md @@ -1,6 +1,6 @@ # MariaDB MaxScale 2.4.1 Release Notes -Release 2.4.1 is a Beta release. +Release 2.4.1 is a GA release. This document describes the changes in release 2.4.1, when compared to the previous release in the same series. @@ -10,6 +10,7 @@ report on [our Jira](https://jira.mariadb.org/projects/MXS). ## Bug fixes +* [MXS-2633](https://jira.mariadb.org/browse/MXS-2633) Pam authentication doesn't work with server 10.4 * [MXS-2603](https://jira.mariadb.org/browse/MXS-2603) MaxScale causes connections to break in Percona PXC Cluster * [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 From 2a8c47b2e56475c973327d6604a420c588ec95b1 Mon Sep 17 00:00:00 2001 From: Esa Korhonen Date: Mon, 19 Aug 2019 15:46:06 +0300 Subject: [PATCH 2/4] Fix compile error on Centos --- maxutils/maxbase/src/test/CMakeLists.txt | 2 +- maxutils/maxbase/src/test/test_name_lookup.cc | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/maxutils/maxbase/src/test/CMakeLists.txt b/maxutils/maxbase/src/test/CMakeLists.txt index 3af01eae1..fbeb0f63f 100644 --- a/maxutils/maxbase/src/test/CMakeLists.txt +++ b/maxutils/maxbase/src/test/CMakeLists.txt @@ -26,5 +26,5 @@ target_link_libraries(test_host_class maxbase pthread rt) add_test(test_host_class test_host_class) add_executable(test_name_lookup test_name_lookup.cc) -target_link_libraries(test_name_lookup maxbase) +target_link_libraries(test_name_lookup maxbase pthread rt) add_test(test_name_lookup test_name_lookup) diff --git a/maxutils/maxbase/src/test/test_name_lookup.cc b/maxutils/maxbase/src/test/test_name_lookup.cc index f1ccd861e..4d3c54054 100644 --- a/maxutils/maxbase/src/test/test_name_lookup.cc +++ b/maxutils/maxbase/src/test/test_name_lookup.cc @@ -11,8 +11,7 @@ * Public License. */ #include - -#include +#include int main() { From 08cc8e023cb62bc8b15eeab266ad2b645fb605c7 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Tue, 20 Aug 2019 12:29:53 +0300 Subject: [PATCH 3/4] Remove test_mxb_http test Fails on too many platforms due to curling to non-existent site not causing an error. --- maxutils/maxbase/src/test/CMakeLists.txt | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/maxutils/maxbase/src/test/CMakeLists.txt b/maxutils/maxbase/src/test/CMakeLists.txt index fbeb0f63f..adda50bad 100644 --- a/maxutils/maxbase/src/test/CMakeLists.txt +++ b/maxutils/maxbase/src/test/CMakeLists.txt @@ -1,9 +1,13 @@ -add_executable(test_mxb_http test_http.cc) -target_link_libraries(test_mxb_http - maxbase - rt -) -add_test(test_mxb_http test_mxb_http) +# On too many platforms curling to a non-existent site +# does not result in a proper error. Disabled for the +# time being. +# +#add_executable(test_mxb_http test_http.cc) +#target_link_libraries(test_mxb_http +# maxbase +# rt +#) +#add_test(test_mxb_http test_mxb_http) add_executable(test_mxb_log test_log.cc) target_link_libraries(test_mxb_log maxbase rt) From b47b7c15edbbc70d9137520e3c590c4f16b3a4eb Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Tue, 20 Aug 2019 12:43:32 +0300 Subject: [PATCH 4/4] Change 2.4.1 release maturity to GA --- VERSION24.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION24.cmake b/VERSION24.cmake index e35b93416..5593ff824 100644 --- a/VERSION24.cmake +++ b/VERSION24.cmake @@ -10,7 +10,7 @@ set(MAXSCALE_VERSION_PATCH "1" CACHE STRING "Patch version") # This should only be incremented if a package is rebuilt set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number") -set(MAXSCALE_MATURITY "Beta" CACHE STRING "Release maturity") +set(MAXSCALE_MATURITY "GA" CACHE STRING "Release maturity") set(MAXSCALE_VERSION_NUMERIC "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}") set(MAXSCALE_VERSION "${MAXSCALE_VERSION_MAJOR}.${MAXSCALE_VERSION_MINOR}.${MAXSCALE_VERSION_PATCH}")