summaryrefslogtreecommitdiff
path: root/mysql-test/collections
diff options
context:
space:
mode:
authorAnitha Gopi <anitha.gopi@oracle.com>2011-05-24 10:25:56 +0530
committerAnitha Gopi <anitha.gopi@oracle.com>2011-05-24 10:25:56 +0530
commit8dc7b927aff0625c010b9304464ce4010a6410d5 (patch)
treec6666433dd72862cc3e3c0f30aa50239e8c8b6e6 /mysql-test/collections
parentf14b66d489cc7d0e995380ff144c6d877a8abb9d (diff)
parent0464f964adc65e34708b5e792bf292ec07343d7b (diff)
downloadmariadb-git-8dc7b927aff0625c010b9304464ce4010a6410d5.tar.gz
Upmerge from 5.1
Diffstat (limited to 'mysql-test/collections')
-rw-r--r--mysql-test/collections/default.experimental3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental
index c0a2d9849e0..a72fbefdd66 100644
--- a/mysql-test/collections/default.experimental
+++ b/mysql-test/collections/default.experimental
@@ -12,7 +12,8 @@ main.lock_multi_bug38499 # Bug#11755645 2009-09-19 alik main.loc
main.outfile_loaddata @solaris # Bug#11755168 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)
main.signal_demo3 @solaris # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
main.sp @solaris # Bug#11755949 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
-query_cache_28249 # Bug#12584161 2009-03-25 main.query_cache_28249 fails sporadically
+main.query_cache_28249 # Bug#12584161 2009-03-25 main.query_cache_28249 fails sporadically
+main.log_tables-big # Bug#11756699 2010-11-15 mattiasj report already exists
main.type_float @freebsd # Bug#11749418 2010-05-04 alik test cases gis-rtree, type_float, type_newdecimal fail in embedded server
main.wait_timeout @solaris # Bug#11758972 2010-04-26 alik wait_timeout fails on OpenSolaris