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

added test/sanity check for master_pos_wait()


mysql-test/r/rpl000016.result:
  do show slave status to test master_pos_wait()
mysql-test/t/rpl000001.test:
  no sleep
mysql-test/t/rpl000002.test:
  no sleep
mysql-test/t/rpl000003.test:
  no sleep
mysql-test/t/rpl000007.test:
  !sleep
mysql-test/t/rpl000008.test:
  !sleep
mysql-test/t/rpl000009.test:
  no sleep
mysql-test/t/rpl000010.test:
  no sleep
mysql-test/t/rpl000011.test:
  no sleep
mysql-test/t/rpl000012.test:
  no sleep
mysql-test/t/rpl000013.test:
  no sleep
mysql-test/t/rpl000014.test:
  no sleep
mysql-test/t/rpl000015.test:
  no sleep
mysql-test/t/rpl000016.test:
  no sleep, test that master_pos_wait() works right
sql/slave.cc:
  fixed bug in master_pos_wait()

1 files changed, 2 insertions, 2 deletions

diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test
index db5b3c720b2..ce04b18d2e8 100644
--- a/mysql-test/t/rpl000015.test
+++ b/mysql-test/t/rpl000015.test
@@ -4,6 +4,7 @@ source include/have_default_master.inc;
 connection master;
 reset master;
 show master status;
+save_master_pos;
 connection slave;
 reset slave;
 show slave status;
@@ -13,7 +14,7 @@ change master to master_host='127.0.0.1',master_user='root',
  master_password='',master_port=9306;
 show slave status;
 slave start;
-sleep 3;
+sync_with_master;
 show slave status;
 connection master;
 drop table if exists foo;
@@ -22,7 +23,6 @@ insert into foo values (10),(45),(90);
 save_master_pos;
 connection slave;
 sync_with_master;
-sleep 1;
 select * from foo;
 connection master;
 drop table foo;