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

Auto-merge from mysql-trunk-merge.

Browse Source
This commit is contained in:
Alexander Nozdrin
2010-01-27 21:44:01 +03:00
parent 13d68d4202 83f7a74bd4
commit 7cd628cfab
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -266,15 +266,16 @@ Reload master
Heartbeat event received
*** Circular replication ***
RESET MASTER;
CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(10));
stop slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
reset master;
reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave;
include/stop_slave.inc
RESET MASTER;
RESET SLAVE;
CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=MASTER_PORT, MASTER_USER='root', MASTER_HEARTBEAT_PERIOD=0.1, MASTER_LOG_FILE='MASTER_BINLOG';
RESET SLAVE;
CHANGE MASTER TO MASTER_HOST='127.0.0.1', MASTER_PORT=SLAVE_PORT, MASTER_USER='root', MASTER_HEARTBEAT_PERIOD=1, MASTER_LOG_FILE='SLAVE_BINLOG';
include/start_slave.inc
CREATE TABLE t1 (a INT PRIMARY KEY, b VARCHAR(10));
INSERT INTO t1 VALUES(1, 'on master');
include/start_slave.inc
INSERT INTO t1 VALUES(2, 'on slave');