From 4fb6815468c379225807309a84b0fe8b97417cea Mon Sep 17 00:00:00 2001
From: unknown <mats@kindahl-laptop.dnsalias.net>
Date: Fri, 27 Jul 2007 15:06:46 +0200
Subject: [PATCH] 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:
  Result change.
mysql-test/suite/rpl_ndb/t/disabled.def:
  Enabling test.
mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test:
  Removing a RESET MASTER since circular replication don't look kindly
  on truncating binlogs.
---
 .../suite/rpl_ndb/r/rpl_ndb_circular_simplex.result      | 9 ++++++++-
 mysql-test/suite/rpl_ndb/t/disabled.def                  | 1 -
 mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test | 1 -
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
index ee452f345f9..18c00583df1 100644
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
+++ b/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	
diff --git a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def
index a1e6cef6fca..de593355c8c 100644
--- a/mysql-test/suite/rpl_ndb/t/disabled.def
+++ b/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
diff --git a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test
index b24dab4b6fe..a832639c9fd 100644
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test
+++ b/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;
-- 
2.30.9