summaryrefslogtreecommitdiff
path: root/mysql-test/t/disabled.def
diff options
context:
space:
mode:
authorAndrei Elkin <aelkin@mysql.com>2009-11-30 14:34:39 +0200
committerAndrei Elkin <aelkin@mysql.com>2009-11-30 14:34:39 +0200
commita6f2076c03bf0b39d7c8f42655b4c6ffe7f3ecb3 (patch)
treec5510a774ac5e8722c26070e21e3d266d6408381 /mysql-test/t/disabled.def
parent71a1b1e755074fa816369a7967ed9bd2758e9f55 (diff)
parentc5a30828067468d08007bdb36903e411652c8e4b (diff)
downloadmariadb-git-a6f2076c03bf0b39d7c8f42655b4c6ffe7f3ecb3.tar.gz
merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20091104182209-iui387z35159aoyw
Diffstat (limited to 'mysql-test/t/disabled.def')
-rw-r--r--mysql-test/t/disabled.def3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 6f0b1716d38..ad7617b9403 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -10,7 +10,8 @@
#
##############################################################################
kill : Bug#37780 2008-12-03 HHunger need some changes to be robust enough for pushbuild.
-innodb_bug39438 : Bug#42383 2009-01-28 lsoares "This fails in embedded and on windows. Note that this test is not run on windows and on embedded in PB for main trees currently"
query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
partition_innodb_builtin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
partition_innodb_plugin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
+innodb-autoinc : Bug#48482 2009-11-02 svoj innodb-autoinc.test fails with results difference
+rpl_killed_ddl : Bug#45520: rpl_killed_ddl fails sporadically in pb2