From 627c1945bc722353773c382b5005684050bd8b6d Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Wed, 4 Apr 2018 13:45:18 +0300 Subject: [PATCH 1/4] Update version number in 2.1 --- VERSION21.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION21.cmake b/VERSION21.cmake index 32d2ff0f4..0df03b735 100644 --- a/VERSION21.cmake +++ b/VERSION21.cmake @@ -5,7 +5,7 @@ set(MAXSCALE_VERSION_MAJOR "2" CACHE STRING "Major version") set(MAXSCALE_VERSION_MINOR "1" CACHE STRING "Minor version") -set(MAXSCALE_VERSION_PATCH "16" CACHE STRING "Patch version") +set(MAXSCALE_VERSION_PATCH "17" CACHE STRING "Patch version") # This should only be incremented if a package is rebuilt set(MAXSCALE_BUILD_NUMBER 1 CACHE STRING "Release number") From 65260c365d4b93dede82dc86f7ac7971e85131c7 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Tue, 24 Apr 2018 10:02:47 +0300 Subject: [PATCH 2/4] MXS-1819 Also log info messages to syslog If info messages are enabled, they will be logged to syslog just like any other messages. --- Documentation/Getting-Started/Configuration-Guide.md | 5 +++-- server/core/log_manager.cc | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Documentation/Getting-Started/Configuration-Guide.md b/Documentation/Getting-Started/Configuration-Guide.md index 127444a3b..3d81f5130 100644 --- a/Documentation/Getting-Started/Configuration-Guide.md +++ b/Documentation/Getting-Started/Configuration-Guide.md @@ -261,9 +261,10 @@ not regularly. Since *MariaDB MaxScale* can log to both file and *syslog* an approach that provides maximum flexibility is to enable *syslog* and *log_to_shm*, and to disable *maxlog*. That way messages will normally be logged to *syslog*, but if -there is something to investigate, *log_info* and *maxlog* can be enabled from +there is something to investigate, *log_debug* and *maxlog* can be enabled from *maxadmin*, in which case informational messages will be logged to the -*maxscale.log* file that resides in shared memory. +*maxscale.log* file that resides in shared memory. But note that *log_debug* +messages will only be available if MaxScale has been built in debug mode. By default, logging to shared memory is disabled. diff --git a/server/core/log_manager.cc b/server/core/log_manager.cc index f9781d171..5711dda8c 100644 --- a/server/core/log_manager.cc +++ b/server/core/log_manager.cc @@ -895,11 +895,12 @@ static int logmanager_write_log(int priority, case LOG_ERR: case LOG_WARNING: case LOG_NOTICE: + case LOG_INFO: syslog(priority, "%s", message); break; default: - // LOG_INFO and LOG_DEBUG messages are never written to syslog. + // LOG_DEBUG messages are never written to syslog. break; } } From 7a81f77649c151d82da814e388c1b52374015aef Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Tue, 24 Apr 2018 10:12:29 +0300 Subject: [PATCH 3/4] Add release notes for 2.1.17 Update Changelog as well. --- Documentation/Changelog.md | 1 + .../MaxScale-2.1.17-Release-Notes.md | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 Documentation/Release-Notes/MaxScale-2.1.17-Release-Notes.md diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md index 99d1c7e74..feaf07879 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.17 Release Notes](Release-Notes/MaxScale-2.1.17-Release-Notes.md) * [MariaDB MaxScale 2.1.16 Release Notes](Release-Notes/MaxScale-2.1.16-Release-Notes.md) * [MariaDB MaxScale 2.1.15 Release Notes](Release-Notes/MaxScale-2.1.15-Release-Notes.md) * [MariaDB MaxScale 2.1.14 Release Notes](Release-Notes/MaxScale-2.1.14-Release-Notes.md) diff --git a/Documentation/Release-Notes/MaxScale-2.1.17-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.1.17-Release-Notes.md new file mode 100644 index 000000000..87ae9ae51 --- /dev/null +++ b/Documentation/Release-Notes/MaxScale-2.1.17-Release-Notes.md @@ -0,0 +1,38 @@ +# MariaDB MaxScale 2.1.17 Release Notes + +Release 2.1.17 is a GA release. + +This document describes the changes in release 2.1.17, when compared +to release [2.1.16](MaxScale-2.1.15-Release-Notes.md). + +For any problems you encounter, please consider submitting a bug report at +[Jira](https://jira.mariadb.org). + +## Changed Features + +* Info level messages will now also be logged to syslog, if logging to + syslog is enabled. + +## Bug fixes + +[Here is a list of bugs fixed in MaxScale 2.1.17.](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.17) + +* [MXS-1819](https://jira.mariadb.org/browse/MXS-1819) log_info does not log to syslog +* [MXS-1788](https://jira.mariadb.org/browse/MXS-1788) MaxInfo crash +* [MXS-1767](https://jira.mariadb.org/browse/MXS-1767) Server capabilities are not correct +* [MXS-1762](https://jira.mariadb.org/browse/MXS-1762) The client IP should be considered when choosing a persistent connection + +## 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). From bafe8f5eeb83f46cf833ff2b6ab6fb3277f1a438 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Tue, 24 Apr 2018 12:31:08 +0300 Subject: [PATCH 4/4] MXS-1618 Use right type for the return value of getopt_long getopt_long returns an 'int'. If 'char' is used on a big-endian platform you'll end up with an infinite loop. --- client/maxadmin.c | 2 +- server/modules/routing/binlogrouter/maxbinlogcheck.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/maxadmin.c b/client/maxadmin.c index d7e4856cd..305ae3700 100644 --- a/client/maxadmin.c +++ b/client/maxadmin.c @@ -142,7 +142,7 @@ main(int argc, char **argv) bool use_unix_socket = false; int option_index = 0; - char c; + int c; while ((c = getopt_long(argc, argv, "h:p::P:u:S:v?ei", long_options, &option_index)) >= 0) { diff --git a/server/modules/routing/binlogrouter/maxbinlogcheck.c b/server/modules/routing/binlogrouter/maxbinlogcheck.c index 820b9aa3d..1585a4789 100644 --- a/server/modules/routing/binlogrouter/maxbinlogcheck.c +++ b/server/modules/routing/binlogrouter/maxbinlogcheck.c @@ -86,7 +86,7 @@ int main(int argc, char **argv) char *key_file = NULL; char *aes_algo = NULL; int report_header = 0; - char c; + int c; while ((c = getopt_long(argc, argv, "dVfMHK:A:?", long_options, &option_index)) >= 0) {