Commit 8b7391c9 authored by sasha@mysql.sashanet.com's avatar sasha@mysql.sashanet.com
Browse files

fixed bug in master_pos_wait(), got rid of sleep hack, 

added test/sanity check for master_pos_wait()
parent 1385ffee

mysql-test/r/rpl000016.result

+4 −0
Original line number Diff line number Diff line 
Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db

127.0.0.1	root	9306	60	master-bin.001	216	Yes		

s

Could not break slave

Tried hard
@@ -7,6 +9,8 @@ master-bin.002 
master-bin.003

Log_name

master-bin.003

Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db

127.0.0.1	root	9306	60	master-bin.003	128	Yes		

m

34

67

mysql-test/t/rpl000001.test

+0 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ insert into foo values(1),(2); 
save_master_pos;

connection slave;

sync_with_master;

sleep 1;

use test;

select * from foo;

select sum(length(word)) from t1;

mysql-test/t/rpl000002.test

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ save_master_pos; 
connection slave;

use test;

sync_with_master;

sleep 1;

@r/rpl000002.result select * from t1;

connection master;

drop table t1;

mysql-test/t/rpl000003.test

+0 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ insert into t1 values (3); 
save_master_pos;

connection slave;

sync_with_master;

sleep 1;

@r/rpl000003.result select * from t1;                                     

connection master;

drop table t1;

mysql-test/t/rpl000007.test

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ insert into bar values(15); 
save_master_pos;

connection slave;

sync_with_master;

sleep 1;

@r/rpl000007.result select foo.n,bar.m from foo,bar;

connection master;

drop table if exists bar,foo;