bk commit into 5.1 tree (mkindahl:1.2648)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mkindahl. When mkindahl 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, 2007-11-27 11:02:00+01:00, mkindahl@stripped +3 -0
  Disabling several tests that fail and reported as errors.

  mysql-test/suite/ndb/t/disabled.def@stripped, 2007-11-27 11:01:55+01:00, mkindahl@stripped +1 -0
    Disabling failing tests.

  mysql-test/suite/rpl/t/disabled.def@stripped, 2007-11-27 11:01:55+01:00, mkindahl@stripped +1 -0
    Disabling failing tests.

  mysql-test/suite/rpl/t/rpl_ssl.test@stripped, 2007-11-27 11:01:55+01:00, mkindahl@stripped +6 -1
    Disabling part of test that fails.

diff -Nrup a/mysql-test/suite/ndb/t/disabled.def b/mysql-test/suite/ndb/t/disabled.def
--- a/mysql-test/suite/ndb/t/disabled.def	2007-10-15 09:17:12 +02:00
+++ b/mysql-test/suite/ndb/t/disabled.def	2007-11-27 11:01:55 +01:00
@@ -12,6 +12,7 @@
 partition_03ndb          : BUG#16385 2006-03-24 mikael Partitions: crash when updating a range partitioned NDB table
 
 ndb_partition_error2	 : HF is not sure if the test can work as internded on all the platforms
+ndb_binlog_basic         : Bug #32759 2007-11-27 mats ndb_binlog_basic assert failure 'thd->transaction.stmt.modified_non_trans_table'
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 #ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events
diff -Nrup a/mysql-test/suite/rpl/t/disabled.def b/mysql-test/suite/rpl/t/disabled.def
--- a/mysql-test/suite/rpl/t/disabled.def	2007-11-26 20:05:50 +01:00
+++ b/mysql-test/suite/rpl/t/disabled.def	2007-11-27 11:01:55 +01:00
@@ -12,3 +12,4 @@
 
 rpl_ddl                  : BUG#26418 2007-03-01 mleich Slave out of sync after CREATE/DROP TEMPORARY TABLE + ROLLBACK on master
 rpl_stm_extraColmaster_ndb : WL#3915 : Statement-based replication not supported in ndb. Enable test when supported.
+rpl_innodb_bug28430      : Bug #32247 2007-11-27 mats Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table)
diff -Nrup a/mysql-test/suite/rpl/t/rpl_ssl.test b/mysql-test/suite/rpl/t/rpl_ssl.test
--- a/mysql-test/suite/rpl/t/rpl_ssl.test	2007-08-28 11:36:09 +02:00
+++ b/mysql-test/suite/rpl/t/rpl_ssl.test	2007-11-27 11:01:55 +01:00
@@ -42,6 +42,10 @@ select * from t1;
 # Do the same thing a number of times
 disable_query_log;
 disable_result_log;
+# 2007-11-27 mats Bug #32756  	Starting and stopping the slave in a loop can lose rows
+# After discussions with Engineering, I'm disabling this part of the test to avoid it causing
+# red trees.
+disable_parsing;
 let $i= 100;
 while ($i)
 {
@@ -54,7 +58,8 @@ while ($i)
   stop slave;
   dec $i;
 }
-start slave;
+enable_parsing;
+START SLAVE;
 enable_query_log;
 enable_result_log;
 connection master;