summaryrefslogtreecommitdiff
path: root/mysql-test/collections
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-09-18 16:35:40 +0300
committerGeorgi Kodinov <joro@sun.com>2009-09-18 16:35:40 +0300
commit5d68d4a534000fe7fce1328b833cebd1f3b193cb (patch)
treea65b46eab2660f0760ae30202474403d94080381 /mysql-test/collections
parent264c433d530165cf54a1d785feabb0c21b8ccf22 (diff)
parent924b4be597f405fbfa3e1856debdc2aee0152569 (diff)
downloadmariadb-git-5d68d4a534000fe7fce1328b833cebd1f3b193cb.tar.gz
automerge
Diffstat (limited to 'mysql-test/collections')
-rw-r--r--mysql-test/collections/README.experimental7
-rw-r--r--mysql-test/collections/default.experimental10
2 files changed, 13 insertions, 4 deletions
diff --git a/mysql-test/collections/README.experimental b/mysql-test/collections/README.experimental
index 9eee2394423..2f5ee7b00ab 100644
--- a/mysql-test/collections/README.experimental
+++ b/mysql-test/collections/README.experimental
@@ -23,3 +23,10 @@ The syntax is as follows:
start with the same characters up to the last letter before the asterisk
are considered experimental:
main.a* # get rid of main.alias, main.alibaba and main.agliolio
+
+6) Optionally, the test case may be followed by one or more platform
+ qualifiers beginning with @ or @!. The test will then be considered
+ experimental only/except on that platform. Basic OS names as
+ reported by $^O in Perl, or 'windows' are supported, this includes
+ solaris, linux, windows, aix, darwin, ... Example:
+ main.alias @aix @windows # Fails on those
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental
index 8bec38a373b..416bf7d9e67 100644
--- a/mysql-test/collections/default.experimental
+++ b/mysql-test/collections/default.experimental
@@ -1,6 +1,8 @@
funcs_1.charset_collation_1 # depends on compile-time decisions
-binlog.binlog_tmp_table # Bug#45578: Test binlog_tmp_table fails ramdonly on PB2: Unknown table 't2'
-main.ctype_gbk_binlog # Bug#46010: main.ctype_gbk_binlog fails sporadically : Table 't2' already exists
-rpl.rpl_row_create_table # Bug#45576: rpl_row_create_table fails on PB2
+main.plugin_load @solaris # Bug#42144
+binlog.binlog_tmp_table* # Bug#45578: Test binlog_tmp_table fails ramdonly on PB2: Unknown table 't2'
+main.ctype_gbk_binlog @solaris # Bug#46010: main.ctype_gbk_binlog fails sporadically : Table 't2' already exists
+rpl.rpl_row_create_table* # Bug#45576: rpl_row_create_table fails on PB2
rpl_ndb.rpl_ndb_log # Bug#38998
-rpl.rpl_innodb_bug28430 # Bug#46029
+rpl.rpl_innodb_bug28430* @solaris # Bug#46029
+rpl.rpl_get_master_version_and_clock* # Bug#46931 2009-08-26 alik rpl.rpl_get_master_version_and_clock fails on hpux11.31