Merge from mysql-trunk.

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

@@ -10,4 +10,4 @@
 #
 ##############################################################################
 
-ndb_trig_1011ext:  Bug#32656 NDB: Duplicate key error aborts transaction in handler. Doesn't talk back to SQL
+ndb_trig_1011ext:  Bug#47564

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

-innodb-index: InnoDB: Error: table `test`.`t1#1` already exists in InnoDB internal
+innodb-index  : Bug#47563 2009-06-11 svoj InnoDB: Error: table `test`.`t1#1` already exists in InnoDB internal

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

-partition_basic_ndb            : Bug#19899 Crashing the server
+partition_basic_ndb            : Bug#44919 parts-suite in mtr tries to use features not supported by ndb
 # http://dev.mysql.com/doc/refman/5.1/en/mysql-cluster-limitations-syntax.html
 partition_syntax_ndb           : Bug#36735 Not supported

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

@@ -10,4 +10,4 @@
 #
 ##############################################################################
 
-rpl_cross_version      : Bug#42311 2009-03-27 joro rpl_cross_version fails on macosx
+rpl_cross_version      : Bug#43913 2009-03-27 joro rpl_cross_version can't pass on conflicts complainig clash with --slave-load-tm