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

5 files changed, 12 insertions, 2 deletions

diff --git a/mysql-test/r/rpl000001.result b/mysql-test/r/rpl000001.result
index 57621d1ec0b..925c5599d77 100644
--- a/mysql-test/r/rpl000001.result
+++ b/mysql-test/r/rpl000001.result
@@ -6,7 +6,7 @@ sum(length(word))
 (@id := id) - id
 0
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
-127.0.0.1	root	9306	1	master-bin.001	1729584	No			1053	Slave: query ' update t1 set n = n + 1' partially completed on the master and was aborted. There is a chance that your master is inconsistent at this point. If you are sure that your master is ok, run this query manually on the slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1; SLAVE START;	0
+127.0.0.1	root	9306	1	master-bin.001	1729137	No			1053	Slave: query ' update t1 set n = n + 1' partially completed on the master and was aborted. There is a chance that your master is inconsistent at this point. If you are sure that your master is ok, run this query manually on the slave and then restart the slave with SET SQL_SLAVE_SKIP_COUNTER=1; SLAVE START;	0
 count(*)
 30000
 n
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;
diff --git a/mysql-test/t/rpl000015-slave.sh b/mysql-test/t/rpl000015-slave.sh
new file mode 100755
index 00000000000..a421a6f287b
--- /dev/null
+++ b/mysql-test/t/rpl000015-slave.sh
@@ -0,0 +1 @@
+rm $MYSQL_TEST_DIR/var/slave-data/master.info
diff --git a/mysql-test/t/rpl000015.test b/mysql-test/t/rpl000015.test
index ce04b18d2e8..0cf87d0fae4 100644
--- a/mysql-test/t/rpl000015.test
+++ b/mysql-test/t/rpl000015.test
@@ -13,7 +13,7 @@ show slave status;
 change master to master_host='127.0.0.1',master_user='root',
  master_password='',master_port=9306;
 show slave status;
-slave start;
+!slave start;
 sync_with_master;
 show slave status;
 connection master;
diff --git a/mysql-test/t/rpl000016-slave.sh b/mysql-test/t/rpl000016-slave.sh
new file mode 100755
index 00000000000..a421a6f287b
--- /dev/null
+++ b/mysql-test/t/rpl000016-slave.sh
@@ -0,0 +1 @@
+rm $MYSQL_TEST_DIR/var/slave-data/master.info