Merge branch '2.3' into 2.4

mariadb-corporation · Oct 29, 2019 · 861e27e · 861e27e
2 parents 4d51342 + 363498e
commit 861e27e
Show file tree

Hide file tree

Showing 548 changed files with 596 additions and 548 deletions.
diff --git a/COPYRIGHT b/COPYRIGHT
@@ -1,10 +1,10 @@
 /*
- * Copyright (c) 2016 MariaDB Corporation Ab
+ * Copyright (c) 2019 MariaDB Corporation Ab
  *
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2022-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/Documentation/Changelog.md b/Documentation/Changelog.md
@@ -58,6 +58,7 @@ For more details, please refer to:
 
 For more details, please refer to:
 
+* [MariaDB MaxScale 2.3.13 Release Notes](Release-Notes/MaxScale-2.3.13-Release-Notes.md)
 * [MariaDB MaxScale 2.3.12 Release Notes](Release-Notes/MaxScale-2.3.12-Release-Notes.md)
 * [MariaDB MaxScale 2.3.11 Release Notes](Release-Notes/MaxScale-2.3.11-Release-Notes.md)
 * [MariaDB MaxScale 2.3.10 Release Notes](Release-Notes/MaxScale-2.3.10-Release-Notes.md)

diff --git a/Documentation/Release-Notes/MaxScale-2.3.13-Release-Notes.md b/Documentation/Release-Notes/MaxScale-2.3.13-Release-Notes.md
@@ -0,0 +1,47 @@
+# MariaDB MaxScale 2.3.13 Release Notes
+
+Release 2.3.13 is a GA release.
+
+This document describes the changes in release 2.3.13, 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-2733](https://jira.mariadb.org/browse/MXS-2733) UTC_TIMESTAMP not recognized as a built-in function
+* [MXS-2721](https://jira.mariadb.org/browse/MXS-2721) MaxScale 2.4.2 crashes on different lxc containers with similar error
+* [MXS-2720](https://jira.mariadb.org/browse/MXS-2720) maxctrl and maxadmin report negative number of connections to a service
+* [MXS-2713](https://jira.mariadb.org/browse/MXS-2713) SET PASSWORD statement sent to all nodes, not only to master
+* [MXS-2712](https://jira.mariadb.org/browse/MXS-2712) maxctrl help does not explain meaning of the output columns of some commands
+* [MXS-2706](https://jira.mariadb.org/browse/MXS-2706) Maxscale maxinfo plugin breaks maxscale_exporter (JSON output all strings)
+* [MXS-2699](https://jira.mariadb.org/browse/MXS-2699) Two QC bugs
+* [MXS-2694](https://jira.mariadb.org/browse/MXS-2694) COM_BINLOG_DUMP confuses readwritesplit
+* [MXS-2688](https://jira.mariadb.org/browse/MXS-2688) SET should be classified as QUERY_TYPE_SESSION_WRITE
+* [MXS-2673](https://jira.mariadb.org/browse/MXS-2673) Sys var and user var combined issue
+* [MXS-2645](https://jira.mariadb.org/browse/MXS-2645) Session client count is not always decremented when closing session
+* [MXS-2639](https://jira.mariadb.org/browse/MXS-2639) maxinfo memory leak
+* [MXS-2620](https://jira.mariadb.org/browse/MXS-2620) Document that shutting down the master can break auto_rejoin and lose transactions
+* [MXS-2610](https://jira.mariadb.org/browse/MXS-2610) [AVRO ROUTER] Maxscale Crash
+* [MXS-2600](https://jira.mariadb.org/browse/MXS-2600) Documentation is inconsistent regarding privileges for MariaDB Monitor
+
+## 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).
diff --git a/Documentation/check_links.sh b/Documentation/check_links.sh
@@ -5,7 +5,7 @@
 # Use of this software is governed by the Business Source License included
 # in the LICENSE.TXT file and at www.mariadb.com/bsl11.
 #
-# Change Date: 2023-01-01
+# Change Date: 2023-10-29
 #
 # On the date above, in accordance with the Business Source License, use
 # of this software will be governed by version 2 or later of the General

diff --git a/LICENSE23.TXT b/LICENSE23.TXT
@@ -4,13 +4,13 @@ License text copyright (c) 2019 MariaDB Corporation Ab, All Rights Reserved.
 Parameters
 
 Licensor:             MariaDB Corporation Ab
-Licensed Work:        MariaDB MaxScale (TM) v.2.3.
+Licensed Work:        MariaDB MaxScale (TM) v.2.3.13
                       The Licensed Work is (c) 2019 MariaDB Corporation Ab
 Additional Use Grant: You may use the Licensed Work when your application
                       uses the Licensed Work with a total of less than three
                       server instances for any purpose.
 
-Change Date:          2022-01-01
+Change Date:          2023-10-29
 
 Change License:       Version 2 or later of the GNU General Public License as
                       published by the Free Software Foundation.

diff --git a/LICENSE24.TXT b/LICENSE24.TXT
@@ -10,7 +10,7 @@ Additional Use Grant: You may use the Licensed Work when your application
                       uses the Licensed Work with a total of less than three
                       server instances for any purpose.
 
-Change Date:          2023-01-01
+Change Date:          2023-10-29
 
 Change License:       Version 2 or later of the GNU General Public License as
                       published by the Free Software Foundation.

diff --git 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 "13" CACHE STRING "Patch version")
+set(MAXSCALE_VERSION_PATCH "14" 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/avro/maxavro.cc b/avro/maxavro.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/avro/maxavro.hh b/avro/maxavro.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/avro/maxavro_datablock.cc b/avro/maxavro_datablock.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/avro/maxavro_file.cc b/avro/maxavro_file.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/avro/maxavro_internal.hh b/avro/maxavro_internal.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/avro/maxavro_record.cc b/avro/maxavro_record.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/avro/maxavro_schema.cc b/avro/maxavro_schema.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/avro/maxavro_write.cc b/avro/maxavro_write.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/avro/maxavrocheck.cc b/avro/maxavrocheck.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/avro/test/test_values.cc b/avro/test/test_values.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/client/maxadmin.c b/client/maxadmin.c
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/examples/examplefilter.cc b/examples/examplefilter.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/examples/examplefilter.hh b/examples/examplefilter.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/examples/examplefiltersession.cc b/examples/examplefiltersession.cc
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/examples/examplefiltersession.hh b/examples/examplefiltersession.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/examples/roundrobinrouter.cpp b/examples/roundrobinrouter.cpp
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/adminusers.h.in b/include/maxscale/adminusers.h.in
@@ -5,7 +5,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/authenticator.hh b/include/maxscale/authenticator.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/backend.hh b/include/maxscale/backend.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/buffer.hh b/include/maxscale/buffer.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/ccdefs.hh b/include/maxscale/ccdefs.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/cdefs.h b/include/maxscale/cdefs.h
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/clock.h b/include/maxscale/clock.h
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/config.hh b/include/maxscale/config.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/customparser.hh b/include/maxscale/customparser.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/dcb.hh b/include/maxscale/dcb.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/encryption.h b/include/maxscale/encryption.h
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/event.hh b/include/maxscale/event.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/filter.hh b/include/maxscale/filter.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/hint.h b/include/maxscale/hint.h
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/housekeeper.h b/include/maxscale/housekeeper.h
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General

diff --git a/include/maxscale/http.hh b/include/maxscale/http.hh
@@ -4,7 +4,7 @@
  * Use of this software is governed by the Business Source License included
  * in the LICENSE.TXT file and at www.mariadb.com/bsl11.
  *
- * Change Date: 2023-01-01
+ * Change Date: 2023-10-29
  *
  * On the date above, in accordance with the Business Source License, use
  * of this software will be governed by version 2 or later of the General