bk commit into 5.1 tree (msvensson:1.2579) 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 15:42:27+01:00, msvensson@stripped +2 -0
  Mask columns 35 and 36 since Last_IO_errno is not reset du to 
  bug#34654

  mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result@stripped, 2008-03-14 15:42:25+01:00,
msvensson@stripped +4 -4
    Mask columns 35 and 36 since Last_IO_errno is not reset du to 
    bug#34654

  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test@stripped, 2008-03-14 15:42:25+01:00,
msvensson@stripped +4 -2
    Mask columns 35 and 36 since Last_IO_errno is not reset du to 
    bug#34654

diff -Nrup a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result	2008-03-14 15:25:09 +01:00
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result	2008-03-14 15:42:25 +01:00
@@ -52,8 +52,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;
@@ -95,8 +95,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	
 STOP SLAVE;
diff -Nrup a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test
b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test	2008-03-14 15:25:09 +01:00
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test	2008-03-14 15:42:25 +01:00
@@ -39,13 +39,15 @@ INSERT INTO t1 VALUES (2,3);
 --connection slave
 SELECT * FROM t1 ORDER BY a;
 #SELECT * FROM t2 ORDER BY a;
---replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
+# BUG#34654 Last_IO_Errno is not reset - Mask columns 35 and 36
+--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 #
 --query_vertical show slave status;
 # connect to master and ensure data it there.
 --connection master
 SELECT * FROM t1 ORDER BY a;
 #SELECT * FROM t2 ORDER BY a;
---replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 #
+# BUG#34654 Last_IO_Errno is not reset - Mask columns 35 and 36
+--replace_column 1 # 4 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 #
 --query_vertical show slave status;
 
 # stop replication on "master" as not to replicate