Automerge from mysql-5.1

This commit is contained in:
Anitha Gopi 2011-05-24 15:47:52 +05:30
commit 3cf30b89ba

View file

@ -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