Automerge from mysql-5.1

12fb58e6 · Anitha Gopi · bb60fc2b · 22f5e06b · 12fb58e6
Commit 12fb58e6 authored May 24, 2011 by Anitha Gopi
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

mysql-test/collections/default.experimental mysql-test/collections/default.experimental +0 -1

No files found.
--- 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