mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

BUG#37975: wait_for_slave_* should increase the timeout

Browse source 
Post-push fixes: forgot to commit an updated result file.
This commit is contained in:
Sven Sandberg 2008-07-14 16:06:03 +02:00
parent af598eccdc
commit 361458c643
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result
View file

@ -4,7 +4,7 @@ reset master;
reset slave; reset slave;
drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9; drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
start slave; start slave;
stop slave; include/stop_slave.inc
reset master; reset master;
reset slave; reset slave;
reset master; reset master;
@ -117,11 +117,7 @@ Aberdeen
Abernathy Abernathy
aberrant aberrant
aberration aberration
start slave; include/start_slave.inc
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
select * from t1 order by 1 asc; select * from t1 order by 1 asc;
word word
Aarhus Aarhus
@ -194,7 +190,8 @@ Abernathy
aberrant aberrant
aberration aberration
flush logs; flush logs;
stop slave; include/stop_slave.inc
include/start_slave.inc
create table t2 (n int)ENGINE=NDB; create table t2 (n int)ENGINE=NDB;
insert into t2 values (1); insert into t2 values (1);
show binlog events from <binlog_start>; show binlog events from <binlog_start>;
@ -230,7 +227,6 @@ show binary logs;
Log_name File_size Log_name File_size
master-bin.000001 1760 master-bin.000001 1760
master-bin.000002 623 master-bin.000002 623
start slave;
show binary logs; show binary logs;
Log_name File_size Log_name File_size
slave-bin.000001 1855 slave-bin.000001 1855