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

into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.1-new
a809bdf5 · tomas@poseidon.ndb.mysql.com · 7831fab0 · 77ec5f70 · a809bdf5
Commit a809bdf5 authored Mar 24, 2006 by tomas@poseidon.ndb.mysql.com
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

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

No files found.
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -27,8 +27,8 @@ rpl_ndb_2innodb         : assertion in get_parts_for_update()
 rpl_ndb_2myisam         : assertion in get_parts_for_update()
 rpl_ndb_auto_inc        : Bug#17086
 #rpl_ndb_basic           : Bug#16228 [IN REVIEW]
-rpl_ndb_blob            : interferes with following tests, causing hang
+#rpl_ndb_blob            : interferes with following tests, causing hang
-rpl_ndb_blob2           : interferes with following tests, causing hang
+#rpl_ndb_blob2           : interferes with following tests, causing hang
 rpl_ndb_ddl             : master hangs
 #rpl_ndb_delete_nowhere  : Bug#17400: delete & update of rows in table without pk fails
 rpl_ndb_innodb2ndb      : Bug#18261: Cluster Replication: tests rpl_ndb_xxx2ndb fails