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

[Nuno Carvalho]

 3615 Nuno Carvalho	2012-02-20
      WL#5223: Binary Log Group Commit
      
      Updated commit_1innodb test (commit_inc_row).

    modified:
      mysql-test/include/commit.inc
      mysql-test/r/commit_1innodb.result
 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
=== modified file 'mysql-test/include/commit.inc'
--- a/mysql-test/include/commit.inc	2012-02-19 20:40:25 +0000
+++ b/mysql-test/include/commit.inc	2012-02-20 14:17:56 +0000
@@ -607,7 +607,7 @@ call p_verify_status_increment(2, 0, 2,
 drop table t2;
 set sql_mode=no_engine_substitution;
 create temporary table t2 (a int);
-call p_verify_status_increment(2, 0, 0, 0);
+call p_verify_status_increment(2, 0, 1, 0);
 set sql_mode=default;
 --echo # 19. A function changes temp-trans-table.
 --echo #
@@ -638,7 +638,7 @@ call p_verify_status_increment(2, 0, 1,
 --echo #
 alter table t2 add column b int default 5;
 --echo # A commit is done internally by ALTER. 
-call p_verify_status_increment(3, 0, 3, 0);
+call p_verify_status_increment(3, 0, 2, 0);
 commit;
 --echo # There is nothing left to commit
 call p_verify_status_increment(0, 0, 0, 0);
@@ -650,7 +650,7 @@ call p_verify_status_increment(0, 0, 0,
 --echo # 24. DDL: TRUNCATE TEMPORARY TABLE
 --echo
 truncate table t2;
-call p_verify_status_increment(3, 0, 3, 0);
+call p_verify_status_increment(3, 0, 2, 0);
 commit;
 --echo # There is nothing left to commit
 call p_verify_status_increment(0, 0, 0, 0);

=== modified file 'mysql-test/r/commit_1innodb.result'
--- a/mysql-test/r/commit_1innodb.result	2012-02-19 20:40:25 +0000
+++ b/mysql-test/r/commit_1innodb.result	2012-02-20 14:17:56 +0000
@@ -626,7 +626,7 @@ SUCCESS
 drop table t2;
 set sql_mode=no_engine_substitution;
 create temporary table t2 (a int);
-call p_verify_status_increment(2, 0, 0, 0);
+call p_verify_status_increment(2, 0, 1, 0);
 SUCCESS
 
 set sql_mode=default;
@@ -671,7 +671,7 @@ SUCCESS
 #
 alter table t2 add column b int default 5;
 # A commit is done internally by ALTER. 
-call p_verify_status_increment(3, 0, 3, 0);
+call p_verify_status_increment(3, 0, 2, 0);
 SUCCESS
 
 commit;
@@ -685,7 +685,7 @@ SUCCESS
 # 24. DDL: TRUNCATE TEMPORARY TABLE
 
 truncate table t2;
-call p_verify_status_increment(3, 0, 3, 0);
+call p_verify_status_increment(3, 0, 2, 0);
 SUCCESS
 
 commit;

No bundle (reason: useless for push emails).