summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <mskold@mysql.com>2006-03-24 11:59:11 +0100
committerunknown <mskold@mysql.com>2006-03-24 11:59:11 +0100
commit9b5ce28914392aa928505d0e0f38972587276311 (patch)
treee1d407ef42d6019e354596e29390ddd4d9fc1ac3 /mysql-test
parent7a86236dfdd1645a72d59fa1559dccbc0a3c6367 (diff)
parent9d9ac1b000b1532bd29b25078839dea444fbe84e (diff)
downloadmariadb-git-9b5ce28914392aa928505d0e0f38972587276311.tar.gz
Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into mysql.com:/usr/local/home/marty/MySQL/mysql-5.1-new
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/t/disabled.def4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 708501a1cf9..3777f425774 100644
--- 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_blob2 : 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_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