From 932ca861e461fb01d549b765e401ec84c5d6c46d Mon Sep 17 00:00:00 2001
From: "msvensson@pilot.mysql.com" <>
Date: Fri, 14 Mar 2008 21:06:01 +0100
Subject: [PATCH] Bug#34654 RESET SLAVE and STOP SLAVE/START SLAVE does not
 clear Last_XYZ_Errno

---
 .../suite/rpl_ndb/r/rpl_ndb_circular_simplex.result       | 8 ++++----
 mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test  | 4 ++--
 2 files changed, 6 insertions(+), 6 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 18c00583df1..01f8d94da48 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
@@ -49,8 +49,8 @@ Master_SSL_Cipher
 Master_SSL_Key	
 Seconds_Behind_Master	#
 Master_SSL_Verify_Server_Cert	No
-Last_IO_Errno	0
-Last_IO_Error	
+Last_IO_Errno	#
+Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
 SELECT * FROM t1 ORDER BY a;
@@ -98,7 +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_IO_Errno	#
+Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
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 fcbff1392f4..d5ddfc2b739 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
@@ -49,7 +49,7 @@ sync_with_master;
 
 # Check that there is no error in replication
 --replace_result $SLAVE_MYPORT SLAVE_PORT
---replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
+--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 #
 query_vertical SHOW SLAVE STATUS;
 
 # Check that we have the data on the master
@@ -76,5 +76,5 @@ SELECT * FROM t1 ORDER BY a;
 
 # Check that there is no error in replication
 --replace_result $MASTER_MYPORT MASTER_PORT
---replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 #
+--replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 #
 query_vertical SHOW SLAVE STATUS;