summaryrefslogtreecommitdiff
path: root/mysql-test/collections
diff options
context:
space:
mode:
authorSneha Modi <sneha.modi@oracle.com>2011-11-03 12:30:09 +0530
committerSneha Modi <sneha.modi@oracle.com>2011-11-03 12:30:09 +0530
commit2fb9894131abf3fc6f78847230f1b9642e765212 (patch)
tree4b85d134a50aa404bba319d7147bab306a6b8442 /mysql-test/collections
parent9ab8418fc0b4f33ca721b10174bdd0cc8fc80c71 (diff)
downloadmariadb-git-2fb9894131abf3fc6f78847230f1b9642e765212.tar.gz
BUG#11754168: Reverting back changes as it is making other tests fail.
Diffstat (limited to 'mysql-test/collections')
-rw-r--r--mysql-test/collections/default.experimental1
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental
index 0241397d996..b3623402065 100644
--- a/mysql-test/collections/default.experimental
+++ b/mysql-test/collections/default.experimental
@@ -6,7 +6,6 @@ binlog.binlog_multi_engine # joro : NDB tests marked as experiment
funcs_1.charset_collation_1 # depends on compile-time decisions
main.func_math @freebsd # Bug#11751977 2010-05-04 alik main.func_math fails on FreeBSD in PB2
-main.index_merge_innodb #Bug 11754168 - 45727: Disabled parts of index_merge_innodb due to explain diffs have been enabled
main.lock_multi_bug38499 # Bug#11755645 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
main.outfile_loaddata @solaris # Bug#11755168 2010-01-20 alik Test "outfile_loaddata" fails (reproducible)
main.signal_demo3 @solaris # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun