database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge branch '10.1' into 10.2

Browse Source
This commit is contained in:
Sergei Golubchik
2017-03-30 12:48:42 +02:00
parent 9ec8500998 a00517ac97
commit da4d71d10d
1708 changed files with 29631 additions and 15718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,7 +9,6 @@ SET @restore_slave_net_timeout=@@global.slave_net_timeout;
connection master;
RESET MASTER;
SET @restore_slave_net_timeout=@@global.slave_net_timeout;
SET @restore_event_scheduler=@@global.event_scheduler;
connection slave;
*** Default value ***
@ -245,7 +244,9 @@ include/start_slave.inc
connection master;
SET @@global.event_scheduler=1;
connection slave;
Number of received heartbeat events: 0
connection master;
connection slave;
Received heartbeats meet expectations: TRUE
connection master;
DELETE FROM t1;
DROP EVENT e1;