bzr push into mysql-trunk branch (nuno.carvalho:3613 to 3614) WL#5223

[Nuno Carvalho]

 3614 Nuno Carvalho	2012-02-20
      WL#5223: Binary Log Group Commit
      
      Rmoved absolute path from binlog_group_commit result file.
      Updated mysqld--help-win result file.

    modified:
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/binlog/r/binlog_group_commit.result
      mysql-test/suite/binlog/t/binlog_group_commit.test
 3613 Mats Kindahl	2012-02-20
      WL#5223: Binary Log Group Commit
      
      Fixes to make it compile on Windows and Solaris.
      
      - Switched to using a normal loop instead of legacy_iterator.
      - Removed include/my_iterator.h containing legacy_iterator.
      - Updated perfschema.relaylog result file.

    removed:
      include/my_iterator.h
    modified:
      mysql-test/suite/perfschema/r/relaylog.result
      sql/binlog.cc
      sql/handler.cc
      sql/handler.h
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2011-11-11 12:36:01 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2012-02-20 12:33:17 +0000
@@ -89,6 +89,20 @@ The following options may be given as th
  non-transactional engines for the binary log. If you
  often use statements updating a great number of rows, you
  can increase this to get more performance
+ --binlog-sync-interval=# 
+ Synchronously flush binary log to disk every #
+ millisecond. Use 0 (default) to disable synchronous
+ flushing
+ --binlog-sync-period=# 
+ Synchronously flush binary log to disk after every #th
+ event. Use 0 (default) to disable synchronous flushing
+ --binlog-trx-committed=name 
+ A transaction is considered committed when it is either
+ in durable store or when it is complete. If set to
+ DURABLE either binlog-sync-interval or binlog-sync-period
+ has to be non-zero. If they are both zero, transactions
+ will not be flushed to disk and hence they will never be
+ considered durable.
  --bootstrap         Used by mysql installation scripts.
  --bulk-insert-buffer-size=# 
  Size of tree cache used in bulk insert optimisation. Note
@@ -297,6 +311,13 @@ The following options may be given as th
  The number of tries the slave will make to connect to the
  master before giving up. Deprecated option, use 'CHANGE
  MASTER TO master_retry_count = <num>' instead.
+ --master-trx-read=name 
+ A transaction is read from the binary log when it is
+ complete or when it is durable. If set to *DURABLE*
+ either /binlog-sync-interval/ or /binlog-sync-period/ has
+ to be non-zero or an error will be generated.  If it was
+ possible for both zero, no transactions will ever be read
+ from the binary log and hence never sent out.
  --master-verify-checksum 
  Force checksum verification of logged events in binary
  log before sending them to slaves or printing them in
@@ -835,6 +856,9 @@ binlog-row-event-max-size 1024
 binlog-row-image FULL
 binlog-rows-query-log-events FALSE
 binlog-stmt-cache-size 32768
+binlog-sync-interval 0
+binlog-sync-period 0
+binlog-trx-committed COMPLETE
 bulk-insert-buffer-size 8388608
 character-set-client-handshake TRUE
 character-set-filesystem binary
@@ -910,6 +934,7 @@ lower-case-table-names 1
 master-info-file master.info
 master-info-repository FILE
 master-retry-count 86400
+master-trx-read COMPLETE
 master-verify-checksum FALSE
 max-allowed-packet 1048576
 max-binlog-cache-size 18446744073709547520

=== modified file 'mysql-test/suite/binlog/r/binlog_group_commit.result'
--- a/mysql-test/suite/binlog/r/binlog_group_commit.result	2012-02-19 20:40:25 +0000
+++ b/mysql-test/suite/binlog/r/binlog_group_commit.result	2012-02-20 12:33:17 +0000
@@ -58,6 +58,6 @@ CREATE TABLE t2 (a VARCHAR(16384)) Engin
 SELECT count(*) FROM t2;
 count(*)
 0
-LOAD DATA INFILE '/bzrroot/mysql/server/mkindahl/w5223-trunk-wl5223/mysql-test/var/tmp/bug_46166.data' INTO TABLE t2;
+LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/bug_46166.data' INTO TABLE t2;
 INSERT INTO t2 VALUES ('aaa'), ('bbb'), ('ccc');
 DROP TABLE t2;

=== modified file 'mysql-test/suite/binlog/t/binlog_group_commit.test'
--- a/mysql-test/suite/binlog/t/binlog_group_commit.test	2011-12-11 16:03:12 +0000
+++ b/mysql-test/suite/binlog/t/binlog_group_commit.test	2012-02-20 12:33:17 +0000
@@ -89,6 +89,7 @@ DROP TABLE t1_innodb, t1_myisam;
 
 CREATE TABLE t2 (a VARCHAR(16384)) Engine=InnoDB;
 SELECT count(*) FROM t2;
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 eval LOAD DATA INFILE '$load_file' INTO TABLE t2;
 INSERT INTO t2 VALUES ('aaa'), ('bbb'), ('ccc');
 

No bundle (reason: useless for push emails).