diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-09-23 10:21:16 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-09-23 10:21:16 +0200 |
| commit | da7b7cf6bcfd0041587a2f61297844bee6c94442 (patch) | |
| tree | 97a236adda807ec8e1ff1d51f45242f606a3ae0d /mysql-test/collections | |
| parent | 3948eef1a1dc711fe7405d13217f85fc63732d26 (diff) | |
| parent | e465d113832aeac61a36902c7976d455e1525234 (diff) | |
| download | mariadb-git-da7b7cf6bcfd0041587a2f61297844bee6c94442.tar.gz | |
merge from 5.1 main
Diffstat (limited to 'mysql-test/collections')
| -rw-r--r-- | mysql-test/collections/default.experimental | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental index 416bf7d9e67..1adde3755f1 100644 --- a/mysql-test/collections/default.experimental +++ b/mysql-test/collections/default.experimental @@ -1,8 +1,11 @@ -funcs_1.charset_collation_1 # depends on compile-time decisions -main.plugin_load @solaris # Bug#42144 +# 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' +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.plugin_load @solaris # Bug#42144 +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_ndb.rpl_ndb_log # Bug#38998 -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 |