diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md index 1d7ae4227..e377d191f 100644 --- a/Documentation/Changelog.md +++ b/Documentation/Changelog.md @@ -28,6 +28,7 @@ the master. There is also limited capability for rejoining nodes. For more details, please refer to: +* [MariaDB MaxScale 2.2.5 Release Notes](Release-Notes/MaxScale-2.2.5-Release-Notes.md) * [MariaDB MaxScale 2.2.4 Release Notes](Release-Notes/MaxScale-2.2.4-Release-Notes.md) * [MariaDB MaxScale 2.2.3 Release Notes](Release-Notes/MaxScale-2.2.3-Release-Notes.md) * [MariaDB MaxScale 2.2.2 Release Notes](Release-Notes/MaxScale-2.2.2-Release-Notes.md) @@ -55,6 +56,7 @@ For more details, please refer to: * 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/Getting-Started/Configuration-Guide.md b/Documentation/Getting-Started/Configuration-Guide.md index 3e9511166..cd4aa89b7 100644 --- a/Documentation/Getting-Started/Configuration-Guide.md +++ b/Documentation/Getting-Started/Configuration-Guide.md @@ -306,9 +306,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/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). diff --git a/Documentation/Release-Notes/MaxScale-2.2.5-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.2.5-Release-Notes.md index b13f160d6..0425a4eeb 100644 --- a/Documentation/Release-Notes/MaxScale-2.2.5-Release-Notes.md +++ b/Documentation/Release-Notes/MaxScale-2.2.5-Release-Notes.md @@ -1,4 +1,4 @@ -# MariaDB MaxScale 2.2.5 Release Notes +# MariaDB MaxScale 2.2.5 Release Notes -- 2018-04 Release 2.2.5 is a GA release. @@ -10,6 +10,9 @@ 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. + ## Dropped Features ## New Features @@ -30,6 +33,13 @@ done with the following command: ## Bug fixes +* [MXS-1819](https://jira.mariadb.org/browse/MXS-1819) log_info does not log to syslog +* [MXS-1815](https://jira.mariadb.org/browse/MXS-1815) threads=auto doesn't work as documented +* [MXS-1814](https://jira.mariadb.org/browse/MXS-1814) Log warning when log_debug is used with release packages +* [MXS-1808](https://jira.mariadb.org/browse/MXS-1808) COM_STMT_SEND_LONG_DATA lead to crash +* [MXS-1807](https://jira.mariadb.org/browse/MXS-1807) Module command domains are case sensitive +* [MXS-1805](https://jira.mariadb.org/browse/MXS-1805) MaxScale may hang with multiple concurrent maxadmin calls. +* [MXS-1803](https://jira.mariadb.org/browse/MXS-1803) MaxScale docker image does not work * [MXS-1787](https://jira.mariadb.org/browse/MXS-1787) Crash with mysql client test `test_bug49972` * [MXS-1786](https://jira.mariadb.org/browse/MXS-1786) Hang with COM_STATISTICS * [MXS-1785](https://jira.mariadb.org/browse/MXS-1785) request 16M-1 normal sql + 'select 1' core dump with debug mode 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") diff --git a/server/core/log_manager.cc b/server/core/log_manager.cc index 91aa4dd1b..4fdf3f4f3 100644 --- a/server/core/log_manager.cc +++ b/server/core/log_manager.cc @@ -896,11 +896,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; } }