Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new

into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new

Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/home/ndbdev/jmiller/clones/mysql-5.1-new
5ea8f304 · jmiller@mysql.com · 35f0ebac · f063d806 · 5ea8f304
Commit 5ea8f304 authored Jan 24, 2006 by jmiller@mysql.com
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

mysql-test/t/disabled.def mysql-test/t/disabled.def +1 -1

No files found.
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -24,7 +24,7 @@ partition_03ndb : Bug#16385
 ndb_binlog_basic   : Results are not deterministic, Tomas will fix
 rpl_ndb_basic   : Bug#16228
 rpl_sp          : Bug #16456
-ndb_dd_disk2memory : Bug #16466
+ndb_dd_disk2memory : Bug #16466 & 16736
 ndb_autodiscover : Needs to be fixed w.r.t binlog
 ndb_autodiscover2 : Needs to be fixed w.r.t binlog
 system_mysql_db : Needs fixing