summaryrefslogtreecommitdiff
path: root/mysql-test/collections
diff options
context:
space:
mode:
authorBjorn Munch <Bjorn.Munch@sun.com>2009-10-16 23:25:05 +0200
committerBjorn Munch <Bjorn.Munch@sun.com>2009-10-16 23:25:05 +0200
commit72c96cbd0e4d860df5f395a292003c7571e0122e (patch)
treeddabbd0f194c2927c3b6166798c1328e97cbe07d /mysql-test/collections
parent972e938dac7a74c5123267cc9fdcf32511a81419 (diff)
parentedb40a05a13e86c28f90159a4d2df6675348cb84 (diff)
downloadmariadb-git-72c96cbd0e4d860df5f395a292003c7571e0122e.tar.gz
merge from 5.1 main
Diffstat (limited to 'mysql-test/collections')
-rw-r--r--mysql-test/collections/default.experimental35
1 files changed, 34 insertions, 1 deletions
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental
index 1adde3755f1..67f8b1ae4d8 100644
--- a/mysql-test/collections/default.experimental
+++ b/mysql-test/collections/default.experimental
@@ -1,11 +1,44 @@
# 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: 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
+funcs_1.is_cml_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+funcs_1.is_columns_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+funcs_1.is_engines_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+funcs_1.is_tables_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+funcs_1.ndb* # joro : NDB tests marked as experimental as agreed with bochklin
+
+funcs_2.ndb_charset # joro : NDB tests marked as experimental as agreed with bochklin
+
main.ctype_gbk_binlog @solaris # Bug#46010: main.ctype_gbk_binlog fails sporadically : Table 't2' already exists
+main.innodb-autoinc* # Bug#47809 2009-10-04 joro innodb-autoinc.test fails with valgrind errors with the innodb plugin
main.plugin_load @solaris # Bug#42144
+
+ndb.* # joro : NDB tests marked as experimental as agreed with bochklin
+
rpl.rpl_get_master_version_and_clock* # Bug#46931 2009-08-26 alik rpl.rpl_get_master_version_and_clock fails on hpux11.31
rpl.rpl_innodb_bug28430* @solaris # Bug#46029
rpl.rpl_row_create_table* # Bug#45576: rpl_row_create_table fails on PB2
+rpl.rpl_trigger* # Bug#47810 2009-10-04 joro rpl.rpl_trigger.test fails with valgrind errors with the innodb plugin
+
+rpl_ndb.* # joro : NDB tests marked as experimental as agreed with bochklin
rpl_ndb.rpl_ndb_log # Bug#38998
+
+stress.ddl_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+
+parts.ndb_dd_backuprestore # joro : NDB tests marked as experimental as agreed with bochklin
+parts.part_supported_sql_func_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_alter1_1_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_alter1_1_2_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_alter1_2_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_auto_increment_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_basic_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_engine_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_int_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_mgm_lc0_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_mgm_lc1_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_mgm_lc2_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_syntax_ndb # joro : NDB tests marked as experimental as agreed with bochklin
+parts.partition_value_ndb # joro : NDB tests marked as experimental as agreed with bochklin