bzr commit into mysql-5.1-telco-6.2-merge branch (msvensson:2827)

[Magnus Svensson]

#At file:///home/msvensson/mysql/6.2-merge/ based on revid:tomas.ulin@stripped

 2827 Magnus Svensson	2009-02-13 [merge]
      Merge
modified:
  mysql-test/suite/ndb/t/disabled.def
  mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result
  mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test

=== modified file 'mysql-test/suite/ndb/t/disabled.def'
--- a/mysql-test/suite/ndb/t/disabled.def	2009-01-15 07:32:40 +0000
+++ b/mysql-test/suite/ndb/t/disabled.def	2009-02-13 07:56:24 +0000
@@ -13,3 +13,4 @@
 ndb_partition_error2 : Bug#40989 ndb_partition_error2 needs maintenance
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
+ndb_cache_trans           : Bug#42197 Query cache and autocommit

=== modified file 'mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result'
--- a/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result	2008-03-14 20:06:01 +0000
+++ b/mysql-test/suite/rpl_ndb/r/rpl_ndb_circular_simplex.result	2009-02-13 09:45:03 +0000
@@ -102,3 +102,4 @@ Last_IO_Errno	#
 Last_IO_Error	#
 Last_SQL_Errno	0
 Last_SQL_Error	
+DROP TABLE t1;

=== modified file 'mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test'
--- a/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test	2008-03-14 20:06:01 +0000
+++ b/mysql-test/suite/rpl_ndb/t/rpl_ndb_circular_simplex.test	2009-02-13 09:45:03 +0000
@@ -78,3 +78,8 @@ SELECT * FROM t1 ORDER BY a;
 --replace_result $MASTER_MYPORT MASTER_PORT
 --replace_column 1 # 7 # 8 # 9 # 22 # 23 # 33 # 35 # 36 #
 query_vertical SHOW SLAVE STATUS;
+
+# cleanup
+connection master;
+DROP TABLE t1;
+sync_slave_with_master;