Merge bk-internal:/home/bk/mysql-5.1-new

into  mysql.com:/home/jimw/my/mysql-5.1-clean


mysql-test/t/disabled.def:
  Auto merged

mysql-test/t/disabled.def

@@ -9,7 +9,6 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-binlog_row_insert_select : Bug #17385
 events                  : Test case instability - infinite locking. To be fixed.
 func_group              : Bug#15448
 func_math               : Bug#15448