diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-03-02 10:24:32 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-03-02 10:24:32 +0300 |
| commit | c04e5bbe7069566b5842cc1f04687d5c964ab2ad (patch) | |
| tree | c1191e2a156ddf906da5d4feb2e6c6a370eeb433 | |
| parent | 24bc23ea11394d76135f55b9fd6dbb7f1515cf96 (diff) | |
| parent | 0c01d8d86c681d57373bf4dd41d555a5f643cec8 (diff) | |
| download | mariadb-git-c04e5bbe7069566b5842cc1f04687d5c964ab2ad.tar.gz | |
Auto-merge from mysql-trunk-merge.
| -rw-r--r-- | mysql-test/collections/default.experimental | 2 |
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 |