#At file:///home/anitha/mysql/repo/mysql-trunk-mod/ based on revid:anitha.gopi@stripped
3105 Anitha Gopi 2011-05-24 [merge]
Automerge from mysql-5.5
modified:
mysql-test/collections/default.experimental
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental 2011-05-24 06:42:00 +0000
+++ b/mysql-test/collections/default.experimental 2011-05-24 10:18:51 +0000
@@ -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
Attachment: [text/bzr-bundle] bzr/anitha.gopi@oracle.com-20110524101851-yazabkeu8bzkdxe2.bundle
| Thread |
|---|
| • bzr commit into mysql-trunk branch (anitha.gopi:3105) | Anitha Gopi | 24 May |