bk commit into 5.1 tree (msvensson:1.2583) BUG#34654

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson.  When msvensson 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, 2008-03-14 21:06:01+01:00, msvensson@stripped +2 -0
  Bug#34654 RESET SLAVE and STOP SLAVE/START SLAVE does not clear Last_XYZ_Errno

  mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result@stripped, 2008-03-14 21:05:59+01:00, msvensson@stripped +4 -4
    Mask Last_IO_Errno

  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test@stripped, 2008-03-14 21:05:59+01:00, msvensson@stripped +2 -2
    Mask Last_IO_Errno

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-07-27 15:06:40 +02:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result	2008-03-14 21:05:59 +01:00
@@ -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 -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-09-05 18:44:44 +02:00
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test	2008-03-14 21:05:59 +01:00
@@ -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;