Merge mysql.com:/home/ram/work/mysql-5.1-engines

into  mysql.com:/home/ram/work/b32676/b32676.5.1

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

@@ -15,3 +15,4 @@ rpl_stm_extraColmaster_ndb : WL#3915 : Statement-based replication not supported
 rpl_innodb_bug28430      : Bug #32247 2007-11-27 mats Test reports wrong value of "AUTO_INCREMENT" (on a partitioned InnoDB table)
 rpl_view                   : Bug#32654: rpl_view.test fails randomly
 rpl_ndb_multi              : Bug#30751: rpl_ndb_multi missing row in output
+rpl_log_pos                : Bug#8693 Test 'rpl_log_pos' fails sometimes

mysql-test/t/disabled.def

@@ -21,4 +21,5 @@ lowercase_table3         : Bug#32667 lowercase_table3.test reports to error log
 kill                 : Bug#29149: Test "kill" fails on Windows
 grant3               : Bug#32723: grant3.test fails
 innodb_mysql         : Bug#32724: innodb_mysql.test fails randomly
-rpl_log_pos          : Bug#8693 Test 'rpl_log_pos' fails sometimes
+wait_timeout         : Bug#32801 wait_timeout.test fails randomly
+kill                 : Bug#29149 Test "kill" fails on Windows