database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge branch '5.5' into 10.0

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-03-03 01:37:54 +02:00
parent cc413ce9a3 5a0fff50f8
commit 1acfa942ed
154 changed files with 3475 additions and 1793 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/rpl/r/rpl_heartbeat_basic.result
View File

@ -7,7 +7,6 @@ RESET SLAVE;
SET @restore_slave_net_timeout=@@global.slave_net_timeout;
RESET MASTER;
SET @restore_slave_net_timeout=@@global.slave_net_timeout;
SET @restore_event_scheduler=@@global.event_scheduler;
*** Default value ***
CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root';
@ -221,7 +220,7 @@ RESET SLAVE;
CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_CONNECT_RETRY=20, MASTER_HEARTBEAT_PERIOD=5;
include/start_slave.inc
SET @@global.event_scheduler=1;
Number of received heartbeat events: 0
Received heartbeats meet expectations: TRUE
DELETE FROM t1;
DROP EVENT e1;