Merge branch '2.1' into 2.2

This commit is contained in:
Johan Wikman 2017-10-31 16:23:49 +02:00
commit 5272119f92
2 changed files with 9 additions and 4 deletions

View File

@ -40,6 +40,7 @@ To enable this functionality, add `query_retries=<number-of-retries>` under the
[Here is a list of bugs fixed in MaxScale 2.1.10.](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.10)
* [MXS-1497](https://jira.mariadb.org/browse/MXS-1497) Don't skip events with LOG_EVENT_IGNORABLE_F flag
* [MXS-1468](https://jira.mariadb.org/browse/MXS-1468) Using dynamic commands to create readwritesplit configs fail after restart
* [MXS-1459](https://jira.mariadb.org/browse/MXS-1459) Binlog checksum default value is wrong if a slave connects with checksum = NONE before master registration or master is not accessible at startup
* [MXS-1457](https://jira.mariadb.org/browse/MXS-1457) Deleted servers are not ignored when users are loaded

View File

@ -269,12 +269,14 @@ Gtid_IO_Pos: 0-10116-196
# Binlog router compatibility
Binlog Router Plugin is compatible with MariaDB 5.5 and MySQL 5.6, the current default.
Binlog Router Plugin is compatible with MariaDB 5.5 and MySQL 5.6/5.7.
In order to use it with MySQL 5.6, the *GTID_MODE* setting must be OFF and connecting
slaves must not use *MASTER_AUTO_POSITION = 1* option.
In order to use it with MySQL 5.6/5.7, the *GTID_MODE* setting must be OFF
and connecting slaves must not use *MASTER_AUTO_POSITION = 1* option.
Additionally with MySQL 5.7 slaves the `send_slave_heartbeat` option must be set to on.
It also works with a MariaDB 10.X setup (master and slaves).
It’s also works with a MariaDB 10.X setup (master and slaves).
Slave connection must not include any GTID feature if MaxScale version is less than 2.2.
Starting from MaxScale 2.2.1 the slave connections might optionally include
**GTID** feature `MASTER_USE_GTID=Slave_pos`: only option *mariadb10-compatibility* is required.
@ -293,6 +295,8 @@ all operations. All slave servers must use the same replication domain as the ma
**Note:** Binlog Router currently does not work for MySQL 5.5 due to
missing *@@global.binlog_checksum* variable.
The default compatibility is MariaDB 10 since MaxScale 2.2.
# Master server setup/change
In the MariaDB MaxScale ini file the server section for master is no longer required, same for *servers=master_server* in the service section. The master server setup is currently managed via *CHANGE MASTER TO* command issued in MySQL client connection to MariaDB MaxScale or by providing a proper *master.ini* file in the *binlogdir*.