Merge kindahl-laptop.dnsalias.net:/home/bkroot/mysql-5.1-rpl

into  kindahl-laptop.dnsalias.net:/home/bk/b27972-mysql-5.1-rpl


mysql-test/suite/rpl_ndb/t/disabled.def:
  Auto merged

mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result

@@ -13,7 +13,6 @@ INSERT INTO t1 VALUES (1,2);
 INSERT INTO t1 VALUES (2,3);
 STOP SLAVE;
 CHANGE MASTER TO MASTER_HOST="127.0.0.1",MASTER_PORT=SLAVE_PORT,MASTER_USER="root";
-RESET MASTER;
 START SLAVE;
 SHOW SLAVE STATUS;
 Slave_IO_State	#
@@ -50,6 +49,10 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	
 SELECT * FROM t1 ORDER BY a;
 a	b
 1	2
@@ -95,3 +98,7 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
+Last_IO_Errno	0
+Last_IO_Error	
+Last_SQL_Errno	0
+Last_SQL_Error	

mysql-test/suite/rpl_ndb/t/disabled.def

@@ -11,7 +11,6 @@
 ##############################################################################
 
 
-rpl_ndb_circular_simplex : BUG#27972 2007-04-20 mats Slave cannot start where it stopped
 rpl_ndb_2innodb          : BUG#19227 2006-04-20 pekka pk delete apparently not replicated
 rpl_ndb_2myisam          : BUG#19227 Seems to pass currently
 rpl_ndb_dd_partitions    : BUG#19259 2006-04-21 rpl_ndb_dd_partitions fails on s/AMD

mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test

@@ -36,7 +36,6 @@ connection master;
 --replace_result $SLAVE_MYPORT SLAVE_PORT
 eval CHANGE MASTER TO MASTER_HOST="127.0.0.1",MASTER_PORT=$SLAVE_MYPORT,MASTER_USER="root";
 
-RESET MASTER;
 START SLAVE;
 
 connection slave;