bzr commit into mysql-6.0 branch (mats:2687)

[Mats Kindahl]

#At file:///home/bzr/merges/merge-6.0-rpl-merge/

 2687 Mats Kindahl	2008-09-18
      Testcase fixes to make tests pass on sles10.
modified:
  mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test

per-file messages:
  mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result
    Result file change.
  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test
    Blanking out Last_IO_Err* fields since they are not
    relevant for the test.
=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result	2007-06-27 12:29:10 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular.result	2008-09-18 12:19:53 +0000
@@ -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;

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test	2007-09-05 16:44:47 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular.test	2008-09-18 12:19:53 +0000
@@ -37,13 +37,13 @@ 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 #
+--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 #
+--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