#At file:///home/anitha/mysql/repo/mysql-5.5-mod/ based on revid:anitha.gopi@stripped
3398 Anitha Gopi 2011-05-24 [merge]
Automerge from mysql-5.1
modified:
mysql-test/collections/default.experimental
=== modified file 'mysql-test/collections/default.experimental'
--- a/mysql-test/collections/default.experimental 2011-05-24 06:40:38 +0000
+++ b/mysql-test/collections/default.experimental 2011-05-24 10:17:52 +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-20110524101752-ih7wau89hby52k38.bundle
| Thread |
|---|
| • bzr commit into mysql-5.5 branch (anitha.gopi:3398) | Anitha Gopi | 24 May |