Commit 99c6db81 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.1


mysql-test/t/disabled.def:
  Merge
parents c7fced7f 4283d9f0

mysql-test/t/disabled.def

+1 −0
Original line number Diff line number Diff line
@@ -37,3 +37,4 @@ binlog_row_insert_select : Bug #17385 
rpl_row_basic_2myisam : Bug #17385

rpl_row_basic_3innodb : Bug #17385

rpl_row_create_table : Bug #17385

ndb_load        : Bug#17233