diff options
author | Vasil Dimov <vasil.dimov@oracle.com> | 2010-08-28 00:58:46 +0300 |
---|---|---|
committer | Vasil Dimov <vasil.dimov@oracle.com> | 2010-08-28 00:58:46 +0300 |
commit | 74c32d69b0e0d75ccef0d3894eece634d146c30a (patch) | |
tree | d99356e2bae5f50c5711a4422e451c976aa216d0 /mysql-test/collections | |
parent | 1087cfc4d5f616f386d7d2b4f912bac358a05517 (diff) | |
parent | 72ec16b1d14fa1d4b2339a49d595e4acdf9d9a2b (diff) | |
download | mariadb-git-74c32d69b0e0d75ccef0d3894eece634d146c30a.tar.gz |
Merge mysql-5.1-innodb -> mysql-5.1-bugteam
Diffstat (limited to 'mysql-test/collections')
-rw-r--r-- | mysql-test/collections/default.experimental | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental index d47523ad945..8da83d8ae97 100644 --- a/mysql-test/collections/default.experimental +++ b/mysql-test/collections/default.experimental @@ -12,6 +12,8 @@ funcs_1.ndb* # joro : NDB tests marked as experiment funcs_2.ndb_charset # joro : NDB tests marked as experimental as agreed with bochklin +innodb_plugin.* @solaris # Bug#56063 InnoDB Plugin mysql-tests fail on Solaris + main.ctype_gbk_binlog @solaris # Bug#46010: main.ctype_gbk_binlog fails sporadically : Table 't2' already exists main.func_str @solaris # joro: Bug#40928 main.sp @solaris # joro : Bug#54138 |