bk commit into 5.1 tree (istruewing:1.2552)

[Ingo Struewing]

Below is the list of changes that have just been committed into a local
5.1 repository of istruewing. When istruewing 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-07-15 18:47:57+02:00, istruewing@stripped +4 -0
  Post-merge fixes
  Disabled tests which break automatic merging due to
  non-empty warnings file.

  mysql-test/suite/ndb/t/disabled.def@stripped, 2007-07-15 18:47:54+02:00, istruewing@stripped +1 -0
    Post-merge fixes
    Disabled tests which break automatic merging due to
    non-empty warnings file.

  mysql-test/suite/rpl/t/disabled.def@stripped, 2007-07-15 18:47:54+02:00, istruewing@stripped +15 -0
    Post-merge fixes
    Disabled tests which break automatic merging due to
    non-empty warnings file.

  mysql-test/suite/rpl_ndb/t/disabled.def@stripped, 2007-07-15 18:47:54+02:00, istruewing@stripped +2 -0
    Post-merge fixes
    Disabled tests which break automatic merging due to
    non-empty warnings file.

  mysql-test/t/disabled.def@stripped, 2007-07-15 18:47:54+02:00, istruewing@stripped +2 -0
    Post-merge fixes
    Disabled tests which break automatic merging due to
    non-empty warnings file.

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-07-04 23:39:23 +02:00
+++ b/mysql-test/suite/ndb/t/disabled.def	2007-07-15 18:47:54 +02:00
@@ -22,3 +22,4 @@ ndb_partition_error2	 : HF is not sure i
 #ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events
 #ndb_binlog_discover      : bug#21806 2006-08-24
 #ndb_autodiscover3        : bug#21806
+ndb_autodiscover3         : Bug#20872 2007-07-15 ingo master*.err: miscellaneous error messages
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-07-09 11:31:16 +02:00
+++ b/mysql-test/suite/rpl/t/disabled.def	2007-07-15 18:47:54 +02:00
@@ -14,3 +14,18 @@ rpl_ddl                  : BUG#26418 200
 rpl_innodb_mixed_ddl     : Bug #29363 rpl.rpl_innodb_mixed_* test failures
 rpl_innodb_mixed_dml     : Bug #29363 rpl.rpl_innodb_mixed_* test failures
 rpl_invoked_features     : BUG#29020 2007-06-21 Lars Non-deterministic test case
+rpl_deadlock_innodb        : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
+rpl_extraCol_innodb        : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
+rpl_extraCol_myisam        : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
+rpl_incident               : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
+rpl_known_bugs_detection   : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
+rpl_loaddata               : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
+rpl_loaddata_fatal         : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
+rpl_rewrt_db               : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
+rpl_rotate_logs            : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
+rpl_row_inexist_tbl        : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
+rpl_row_tabledefs_2myisam  : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
+rpl_row_tabledefs_3innodb  : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
+rpl_ssl                    : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
+rpl_stm_EE_err2            : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
+rpl_stm_mystery22          : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
diff -Nrup a/mysql-test/suite/rpl_ndb/t/disabled.def b/mysql-test/suite/rpl_ndb/t/disabled.def
--- a/mysql-test/suite/rpl_ndb/t/disabled.def	2007-07-04 23:39:24 +02:00
+++ b/mysql-test/suite/rpl_ndb/t/disabled.def	2007-07-15 18:47:54 +02:00
@@ -26,3 +26,5 @@ rpl_ndb_ctype_ucs2_def   : BUG#27404 uti
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 
 #rpl_ndb_dd_advance	 : Bug#25913 rpl_ndb_dd_advance fails randomly
+rpl_ndb_extraCol           : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
+rpl_truncate_7ndb          : Bug#29809 2007-07-15 ingo Slave SQL errors in warnings file
diff -Nrup a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
--- a/mysql-test/t/disabled.def	2007-07-14 19:35:37 +02:00
+++ b/mysql-test/t/disabled.def	2007-07-15 18:47:54 +02:00
@@ -25,3 +25,5 @@ ctype_big5               : BUG#26711 200
 
 mysql_upgrade        : Bug#28560 test links to /usr/local/mysql/lib libraries, causes non-determinism and failures on ABI breakage
 federated_innodb     : Bug#29522 failed assertion in binlog_close_connection()
+binlog_innodb        : Bug#29806 2007-07-15 ingo master.err: InnoDB: Error: MySQL is freeing a thd
+innodb_mysql         : Bug#29807 2007-07-15 ingo master.err: Cannot find table test/t2 from the internal data dictionary