diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result index a840f059439..8b480df8d0c 100644 --- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result +++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result @@ -4,7 +4,7 @@ reset master; reset slave; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; start slave; -stop slave; +include/stop_slave.inc reset master; reset slave; reset master; @@ -117,11 +117,7 @@ Aberdeen Abernathy aberrant aberration -start slave; - -let $result_pattern= '%127.0.0.1%root%master-bin.000002%slave-relay-bin.000005%Yes%Yes%0%0%None%' ; - ---source include/wait_slave_status.inc +include/start_slave.inc select * from t1 order by 1 asc; word Aarhus @@ -194,7 +190,8 @@ Abernathy aberrant aberration flush logs; -stop slave; +include/stop_slave.inc +include/start_slave.inc create table t2 (n int)ENGINE=NDB; insert into t2 values (1); show binlog events from ; @@ -230,7 +227,6 @@ show binary logs; Log_name File_size master-bin.000001 1760 master-bin.000002 623 -start slave; show binary logs; Log_name File_size slave-bin.000001 1855