diff options
Diffstat (limited to 'mysql-test/suite/rpl/r/rpl_row_annotate_do.result')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_row_annotate_do.result | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_row_annotate_do.result b/mysql-test/suite/rpl/r/rpl_row_annotate_do.result index 9aeef98d091..c778355d182 100644 --- a/mysql-test/suite/rpl/r/rpl_row_annotate_do.result +++ b/mysql-test/suite/rpl/r/rpl_row_annotate_do.result @@ -1,5 +1,7 @@ include/master-slave.inc [connection master] +connect master2,127.0.0.1,root,,test,$MASTER_MYPORT,; +connection master; ######################################################################## # TABLES ON MASTER ######################################################################## @@ -20,6 +22,7 @@ a b 3 baz 4 gås 5 gås +connection slave; ######################################################################## # TABLES ON SLAVE: should be the same as on master ######################################################################## @@ -55,9 +58,11 @@ a b # Ensure that a replication failure doesn't segfault - MDEV-7864 ######################################################################## DELETE FROM t3 WHERE a=2; +connection master; INSERT INTO t5 (a) SELECT a.a*10000+b.a*1000+c.a*100+d.a*10 FROM t5 a, t5 b, t5 c, t5 d; INSERT INTO t3 (a) SELECT a FROM t5 WHERE a > 10; DELETE t3 FROM t3 INNER JOIN t5 ON t3.a=t5.a; +connection slave; ---- Wait until slave stops with an error ---- include/wait_for_slave_sql_error.inc [errno=1032] Last_SQL_Error (expected "Delete_rows_v1 event on table test1.t3; Can't find record in 't3'" error) @@ -65,6 +70,8 @@ Could not execute Delete_rows_v1 event on table test1.t3; Can't find record in ' call mtr.add_suppression("Slave: Can't find record in 't3' Error_code: 1032"); SET GLOBAL sql_slave_skip_counter=1; START SLAVE; +connection master; +connection slave; ######################################################################## FLUSH LOGS; show binlog events in 'slave-bin.000001' from <start_pos>; @@ -174,15 +181,20 @@ slave-bin.000001 # Rotate 2 # slave-bin.000002;pos=4 ######################################################################## # INSERTs DELAYED ON MASTERs ######################################################################## +connection master; SET SESSION binlog_annotate_row_events = ON; INSERT DELAYED INTO test1.t4 VALUES (1,1); FLUSH TABLES; SELECT * FROM test1.t4 ORDER BY a; a b 1 1 +connection slave; +connection master; +connection slave; ######################################################################## # ON SLAVE # No Annotate_rows events should appear below ######################################################################## FLUSH LOGS; +connection master; include/rpl_end.inc |