bzr push into mysql-trunk branch (shivji.jha:4524 to 4525) Bug#12793893

[Shivji Kumar Jha]

 4525 Shivji Kumar Jha	2012-09-21
      BUG# 12793893 - binlog_innodb timed out in pushbuild.
      
      === Description ===
      
      The test contained a transaction that ran a loop 2000
      times. In every iteration, a row was being being
      inserted into a table. 2000 iterations to build up the
      long transaction sometimes proved to be too costly on
      slow platforms.The purpose behind 2000 iterations was to
      make sure that the transaction used the temporary binary
      log cache and also exceeded the value of
      "binlog_cache_size".
      
      === Fix ===
      
      I toned down the loop at the same time I made sure it
      did not break the purpose.
      1) Made the loop run 600 times.
      2) Decreased the value of "binlog_cache_size" to 4096,
         the minimum allowed value defined in the manual.
     @ mysql-test/suite/binlog/t/binlog_innodb-master.opt
        Decreased the value of "binlog_cache_size" to 4096,
        the minimum allowed value defined in the manual. The
        default value was 32768.
     @ mysql-test/suite/binlog/t/binlog_innodb.test
        The loop runs only 600 times instead of 2000 times.

    added:
      mysql-test/suite/binlog/t/binlog_innodb-master.opt
    modified:
      mysql-test/suite/binlog/t/binlog_innodb.test
 4524 Vasil Dimov	2012-09-21 [merge]
      Merge mysql-5.6 -> mysql-trunk

    modified:
      storage/innobase/dict/dict0load.cc
      storage/innobase/row/row0mysql.cc
=== added file 'mysql-test/suite/binlog/t/binlog_innodb-master.opt'
--- a/mysql-test/suite/binlog/t/binlog_innodb-master.opt	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/binlog/t/binlog_innodb-master.opt	2012-09-21 08:11:35 +0000
@@ -0,0 +1 @@
+--binlog_cache_size=4096

=== modified file 'mysql-test/suite/binlog/t/binlog_innodb.test'
--- a/mysql-test/suite/binlog/t/binlog_innodb.test	2010-06-23 09:56:24 +0000
+++ b/mysql-test/suite/binlog/t/binlog_innodb.test	2012-09-21 08:11:35 +0000
@@ -109,7 +109,7 @@ create table t1 (a int) engine=innodb;
 
 # Now we are going to create transaction which is long enough so its
 # transaction binlog will be flushed to disk...
-let $1=2000;
+let $1=600;
 disable_query_log;
 begin;
 while ($1)

No bundle (reason: useless for push emails).