Merge branch 'develop' into MXS-1266

2017-06-08 17:38:23 +02:00
parent c00d829d56 92fa613f93
commit 23befe8380
679 changed files with 51685 additions and 28890 deletions
--- a/server/modules/routing/binlogrouter/blr_master.c
+++ b/server/modules/routing/binlogrouter/blr_master.c
@ -7,7 +7,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: 2019-07-01
+ * Change Date: 2020-01-01
 *
 * 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