fixed bugs in the new stuff in rpl000001 test

start slave thread if master.info is present and server_id is set
updates for rpl000015 and rpl000016 to remove master.info to make sure
master info struct does not get auto-initialized


Docs/manual.texi:
  updates for recent changes
mysql-test/r/rpl000001.result:
  update for test case change
mysql-test/t/rpl000001.test:
  fixed bugs in the test case
mysql-test/t/rpl000015.test:
  wrong change - to be reversed
sql/mysqld.cc:
  start slave thread if master.info is present and server_id is set
BitKeeper/etc/logging_ok:
  Logging to logging@openlogging.org accepted

1 files changed, 8 insertions, 0 deletions

diff --git a/mysql-test/t/rpl000001.test b/mysql-test/t/rpl000001.test
index c2a6b2aaec9..1170cbebeaf 100644
--- a/mysql-test/t/rpl000001.test
+++ b/mysql-test/t/rpl000001.test
@@ -20,8 +20,14 @@ drop table t1;
 save_master_pos;
 connection slave;
 sync_with_master;
+
 #test handling of aborted connection in the middle of update
 connection master;
+reset master;
+connection slave;
+reset slave;
+
+connection master;
 drop table if exists t1,t2;
 create table t1(n int);
 let $1=30000;
@@ -44,6 +50,8 @@ connection master;
 reap;
 connection slave;
 sync_with_master ;
+#give the slave a chance to exit
+sleep 0.5;
 show slave status;
 set sql_slave_skip_counter=1;
 slave start;