summaryrefslogtreecommitdiff
path: root/mysql-test/collections/default.experimental
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-03-02 10:24:32 +0300
committerAlexander Nozdrin <alik@sun.com>2010-03-02 10:24:32 +0300
commit64b91b2698603d24e8ffde46fc9421a6d2442a35 (patch)
treec1191e2a156ddf906da5d4feb2e6c6a370eeb433 /mysql-test/collections/default.experimental
parent11dab05ecdce7775a53424f75c14dc4492dc8539 (diff)
parent61bd9ef6487829ae8106387dd4a1f5b32b67b4bb (diff)
downloadmariadb-git-64b91b2698603d24e8ffde46fc9421a6d2442a35.tar.gz
Auto-merge from mysql-trunk-merge.
Diffstat (limited to 'mysql-test/collections/default.experimental')
-rw-r--r--mysql-test/collections/default.experimental2
1 files changed, 0 insertions, 2 deletions
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental
index 52291c2b8f8..8a8ffd6f84a 100644
--- a/mysql-test/collections/default.experimental
+++ b/mysql-test/collections/default.experimental
@@ -1,12 +1,10 @@
# For easier human reading (MTR doesn't care), please keep entries
# in alphabetical order. This also helps with merge conflict resolution.
-binlog.binlog_tmp_table* # Bug#45578:2009-07-10 alik Test binlog_tmp_table fails ramdonly on PB2: Unknown table 't2'
binlog.binlog_multi_engine # joro : NDB tests marked as experimental as agreed with bochklin
funcs_1.charset_collation_1 # depends on compile-time decisions
-main.ctype_gbk_binlog @solaris # Bug#46010: main.ctype_gbk_binlog fails sporadically : Table 't2' already exists
main.information_schema # Bug#47449 2009-09-19 alik main.information_schema and innodb.innodb_information_schema fail sporadically
main.lock_multi_bug38499 # Bug#47448 2009-09-19 alik main.lock_multi_bug38499 times out sporadically
main.lock_multi_bug38691 @solaris # Bug#47792 2009-10-02 alik main.lock_multi_bug38691 times out sporadically on Solaris 10