Post-merge fixes

Disabled tests which break automatic merging due to
non-empty warnings file.

mysql-test/suite/ndb/t/disabled.def

@@ -22,3 +22,4 @@ ndb_partition_error2	 : HF is not sure if the test can work as internded on all
 #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

mysql-test/suite/rpl/t/disabled.def

@@ -14,3 +14,18 @@ rpl_ddl                  : BUG#26418 2007-03-01 mleich Slave out of sync after C
 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

mysql-test/suite/rpl_ndb/t/disabled.def

@@ -26,3 +26,5 @@ rpl_ndb_ctype_ucs2_def   : BUG#27404 util thd mysql_parse sig11 when mysqld defa
 # 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

mysql-test/t/disabled.def

@@ -25,3 +25,5 @@ ctype_big5               : BUG#26711 2007-06-21 Lars Test has never worked on Do
 
 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