autocommit 5.1 -> 5.5

mysql-test/collections/default.experimental

@@ -2,9 +2,7 @@
 # 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                   # WL#5867: skozlov: test case moved from unused bugs suite
-binlog.binlog_bug36391                   # WL#5867: skozlov: test case moved from unused bugs suite
-
+binlog.binlog_bug23533                   # skozlov: BUG#12371924
 
 funcs_1.charset_collation_1              # depends on compile-time decisions
 
@@ -18,7 +16,6 @@ main.type_float @freebsd                 # Bug#38965 2010-05-04 alik test cases
 main.wait_timeout @solaris               # Bug#51244 2010-04-26 alik wait_timeout fails on OpenSolaris
 
 rpl.rpl_innodb_bug28430                  # Bug#46029
-rpl.rpl_bug37426                         # WL#5867: skozlov: test case moved from unused bugs suite
 
 sys_vars.max_sp_recursion_depth_func @solaris # Bug#47791 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 sys_vars.plugin_dir_basic                     # Bug#52223 2010-11-24 alik Test "plugin_dir_basic" does not support RPM build (test) directory structure

mysql-test/suite/binlog/r/binlog_bug23533.result

@@ -3,7 +3,9 @@ CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b TEXT, PRIMARY KEY(a)) ENGINE=I
 SELECT COUNT(*) FROM t1;
 COUNT(*)
 1000
+SET @saved_binlog_cache_size=@@binlog_cache_size;
 SET @saved_max_binlog_cache_size=@@max_binlog_cache_size;
+SET GLOBAL binlog_cache_size=4096;
 SET GLOBAL max_binlog_cache_size=4096;
 START TRANSACTION;
 CREATE TABLE t2 SELECT * FROM t1;
@@ -13,4 +15,5 @@ SHOW TABLES LIKE 't%';
 Tables_in_test (t%)
 t1
 SET GLOBAL max_binlog_cache_size=@saved_max_binlog_cache_size;
+SET GLOBAL binlog_cache_size=@saved_binlog_cache_size;
 DROP TABLE t1;

mysql-test/suite/binlog/t/binlog_bug23533.test

@@ -15,14 +15,18 @@ CREATE TABLE t1 (a INT NOT NULL AUTO_INCREMENT, b TEXT, PRIMARY KEY(a)) ENGINE=I
 let $i= 1000;
 while ($i)
 {
+  BEGIN;
   eval INSERT INTO t1 VALUES($i, REPEAT('x', 4096));
+  COMMIT;
   dec $i;
 }
 --enable_query_log
 SELECT COUNT(*) FROM t1;
 
 # Set small value for max_binlog_cache_size
+SET @saved_binlog_cache_size=@@binlog_cache_size;
 SET @saved_max_binlog_cache_size=@@max_binlog_cache_size;
+SET GLOBAL binlog_cache_size=4096;
 SET GLOBAL max_binlog_cache_size=4096;
 
 # Copied data from t1 into t2 large than max_binlog_cache_size
@@ -34,4 +38,5 @@ SHOW TABLES LIKE 't%';
 
 # 5.1 End of Test
 SET GLOBAL max_binlog_cache_size=@saved_max_binlog_cache_size;
+SET GLOBAL binlog_cache_size=@saved_binlog_cache_size;
 DROP TABLE t1;