summaryrefslogtreecommitdiff
path: root/mysql-test/t/disabled.def
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@oracle.com>2010-11-16 10:05:19 +0100
committerJon Olav Hauglid <jon.hauglid@oracle.com>2010-11-16 10:05:19 +0100
commit0caa22b145db22b718434566720fb7dea715692c (patch)
tree7bb909d13afe24120327ea8c3d6aedfc42610685 /mysql-test/t/disabled.def
parenta3d9a26d3b9ada36d7c57815614027c9fa798002 (diff)
parentd6d16303cd5e2ba623f51a115f12954fe4a0ce2c (diff)
downloadmariadb-git-0caa22b145db22b718434566720fb7dea715692c.tar.gz
Merge from mysql-5.5-bugteam to mysql-5.5-runtime
No conflicts
Diffstat (limited to 'mysql-test/t/disabled.def')
-rw-r--r--mysql-test/t/disabled.def5
1 files changed, 5 insertions, 0 deletions
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
index 88f8f2b32f8..d312254da19 100644
--- a/mysql-test/t/disabled.def
+++ b/mysql-test/t/disabled.def
@@ -14,3 +14,8 @@ query_cache_28249 : Bug#43861 2009-03-25 main.query_cache_28249 fails spo
ctype_utf8mb4_ndb : Bug#55799, Bug#51907, disabled by Konstantin 2010-08-06
main.mysqlhotcopy_myisam : Bug#56817 2010-10-21 anitha mysqlhotcopy* fails
main.mysqlhotcopy_archive: Bug#56817 2010-10-21 anitha mysqlhotcopy* fails
+log_tables-big : Bug#48646 2010-11-15 mattiasj report already exists
+read_many_rows_innodb : Bug#37635 2010-11-15 mattiasj report already exists
+sum_distinct-big : Bug#56927 2010-11-15 mattiasj was not tested
+alter_table-big : Bug#37248 2010-11-15 mattiasj was not tested
+create-big : Bug#37248 2010-11-15 mattiasj was not tested