Commit 6e1b1ff8 authored by unknown's avatar unknown
Browse files

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
parents ea14fa9a 9a3259c0

mysql-test/t/disabled.def

+0 −1
Original line number Diff line number Diff line
@@ -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