bk commit into 5.1 tree (mats:1.2540) BUG#27972

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-07-27 15:06:46+02:00, mats@stripped +3 -0
  BUG#27972 (Test failure for rpl_ndb_circular_simplex):
  Removing a RESET MASTER inside the test since that will change binlog
  positions in such a manner that the dual masters lose track of where
  they acually are.

  mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result@stripped, 2007-07-27 15:06:40+02:00, mats@stripped +8 -1
    Result change.

  mysql-test/suite/rpl_ndb/t/disabled.def@stripped, 2007-07-27 15:06:40+02:00, mats@stripped +0 -1
    Enabling test.

  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test@stripped, 2007-07-27 15:06:40+02:00, mats@stripped +0 -1
    Removing a RESET MASTER since circular replication don't look kindly
    on truncating binlogs.

diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result	2007-06-27 14:27:32 +02:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result	2007-07-27 15:06:40 +02:00
@@ -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	
diff -Nrup a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def
--- a/mysql-test/suite/rpl_ndb/t/disabled.def	2007-07-17 19:33:22 +02:00
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2007-07-27 15:06:40 +02:00
@@ -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
diff -Nrup a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test	2007-07-25 15:29:29 +02:00
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test	2007-07-27 15:06:40 +02:00
@@ -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;