hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source
This commit is contained in:
Johan Wikman
2018-02-08 12:47:48 +02:00
parent b15a460416 458edb9b1d
commit bff4f05e3b
2 changed files with 21 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Documentation/Routers/Binlogrouter.md
View File

@ -213,22 +213,25 @@ transaction_safety=on to enable detection of incomplete transactions.
### `send_slave_heartbeat` ### `send_slave_heartbeat`
This defines whether MariaDB MaxScale sends the heartbeat packet to the slave This defines whether MariaDB MaxScale sends the heartbeat packet to the slave
when there are no real binlog events to send. The default value is 'off' and no when there are no real binlog events to send. This parameter takes a boolean
heartbeat events are sent to slave servers. value and the default value is false. This means that no heartbeat events are
sent to slave servers.
If value is 'on' the interval value (requested by the slave during registration) If value is set to true the interval value (requested by the slave during
is reported in the diagnostic output and the packet is send after the time registration) is reported in the diagnostic output and the packet is send after
interval without any event to send. the time interval without any event to send.
### `semisync` ### `semisync`
This parameter controls whether binlog server could ask Master server to start This parameter controls whether binlog server could ask Master server to start
the Semi-Synchronous replication. In order to get semi-sync working, the Master the Semi-Synchronous replication. This parameter takes a boolean value and the
server must have the *rpl_semi_sync_master* plugin installed. The availability default value is false.
of the plugin and the value of the GLOBAL VARIABLE
*rpl_semi_sync_master_enabled* are checked in the Master registration phase: if In order to get semi-sync working, the Master server must have the
the plugin is installed in the Master database, the binlog server subsequently *rpl_semi_sync_master* plugin installed. The availability of the plugin and the
requests the semi-sync option. value of the GLOBAL VARIABLE *rpl_semi_sync_master_enabled* are checked in the
Master registration phase: if the plugin is installed in the Master database,
the binlog server subsequently requests the semi-sync option.
Note: Note:
- the network replication stream from Master has two additional bytes before - the network replication stream from Master has two additional bytes before

8
maxscale-system-test/local_address.cpp
View File

@ -79,7 +79,13 @@ void get_maxscale_ips(TestConnections& test, vector<string>* pIps)
to_collection(output, "\n", pIps); to_collection(output, "\n", pIps);
transform(pIps->begin(), pIps->end(), pIps->begin(), extract_ip); transform(pIps->begin(), pIps->end(), pIps->begin(), extract_ip);
pIps->erase(find(pIps->begin(), pIps->end(), "127.0.0.1")); // Remove 127.0.0.1 if it is present.
auto i = find(pIps->begin(), pIps->end(), "127.0.0.1");
if (i != pIps->end())
{
pIps->erase(i);
}
} }
} }