diff options
| author | Anitha Gopi <anitha.gopi@oracle.com> | 2011-05-24 15:47:52 +0530 |
|---|---|---|
| committer | Anitha Gopi <anitha.gopi@oracle.com> | 2011-05-24 15:47:52 +0530 |
| commit | 3cf30b89baa4499f7bf4ab8e29ab61a3823259fd (patch) | |
| tree | 0e3fc6cc0aaad98fdf78ffe71c35e36d259d3c9f /mysql-test/collections/default.experimental | |
| parent | e4e738be594f7b6ab2e3b6405d8ec2568cec7b6d (diff) | |
| parent | cce8a658436c2ae9052d38e7ca8c2fdf4d212b7d (diff) | |
| download | mariadb-git-3cf30b89baa4499f7bf4ab8e29ab61a3823259fd.tar.gz | |
Automerge from mysql-5.1
Diffstat (limited to 'mysql-test/collections/default.experimental')
| -rw-r--r-- | mysql-test/collections/default.experimental | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysql-test/collections/default.experimental b/mysql-test/collections/default.experimental index a72fbefdd66..abde48b8905 100644 --- a/mysql-test/collections/default.experimental +++ b/mysql-test/collections/default.experimental @@ -2,7 +2,6 @@ # in alphabetical order. This also helps with merge conflict resolution. binlog.binlog_multi_engine # joro : NDB tests marked as experimental as agreed with bochklin -binlog.binlog_bug23533 # skozlov: BUG#12371924 funcs_1.charset_collation_1 # depends on compile-time decisions |