summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <brian@zim.(none)>2006-04-09 20:07:42 -0700
committerunknown <brian@zim.(none)>2006-04-09 20:07:42 -0700
commita514095a5d306fead8d22d03a39c83db18d98ef8 (patch)
tree6e98b1581c786ae0ee47e1147e2ec1c5ce3621f2
parent9b0da58292fe20ac2c320247d1e4701ea79a0d9b (diff)
parentcf272cefc0affce1e4a5f68fb33c9da65125c27f (diff)
downloadmariadb-git-a514095a5d306fead8d22d03a39c83db18d98ef8.tar.gz
Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1-new
into zim.(none):/home/brian/mysql/dep-5.1
-rw-r--r--mysql-test/t/disabled.def1
1 files changed, 1 insertions, 0 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 6393ca3112f..98b1ae08b15 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -27,6 +27,7 @@ ps_7ndb : dbug assert in RBR mode when executing test suite
rpl_ndb_dd_basic : Bug #18569
rpl_row_basic_7ndb : Bug #18923
rpl_ndb_dd_advance : Bug #18924
+rpl_ndb_multi_update2 : Bug #18928
rpl_ndb_2innodb : assertion in get_parts_for_update()
rpl_ndb_2myisam : assertion in get_parts_for_update()
rpl_ndb_auto_inc : Bug#17086