Merge branch '2.3' into 2.4

2019-10-29 14:04:31 +02:00
parent 4d51342561 363498ef6b
commit 861e27eb00
548 changed files with 596 additions and 548 deletions
--- a/server/modules/monitor/mariadbmon/mariadbserver.hh
+++ b/server/modules/monitor/mariadbmon/mariadbserver.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