bzr commit into mysql-5.1-bugteam branch (aelkin:2737) Bug#41383

[Andrei Elkin]

#At file:///home/andrei/MySQL/BZR/FIXES/5.1-bt-bug40221-rbr-stmt-no-stmt-reset/ based on revid:gshchepa@stripped

 2737 Andrei Elkin	2008-12-12
      Bug #41383 Test commit1_innodb fails with binlog-format=row
      
      The test explicitly warned on existence of a bug in its 27th part.
      The expected values of prepare and commit counters changed, corrected, by
      fixes to bug#40221.
      Notice, that binlog does not have to register for a statement with
      the statement binlog-format because the statement rollback does not need
      to do anything in that mode. It's not so with the ROW format which was
      bug#40221 concern.
      
      Fixed with correcting the expected values of the mentioned counters and
      explained that with comments in the test.
modified:
  mysql-test/include/commit.inc
  mysql-test/r/commit_1innodb.result

per-file messages:
  mysql-test/include/commit.inc
    Removing `Sic' that warned on a bug (The one is bug#40221).
    Correcting the expected values of prepare and commit counters due to fixes to bug#40221.
  mysql-test/r/commit_1innodb.result
    results changed.
=== modified file 'mysql-test/include/commit.inc'
--- a/mysql-test/include/commit.inc	2008-03-31 09:29:03 +0000
+++ b/mysql-test/include/commit.inc	2008-12-12 12:52:20 +0000
@@ -671,8 +671,11 @@ call p_verify_status_increment(2, 2, 2, 
 savepoint a;
 call p_verify_status_increment(0, 0, 0, 0);
 insert t1 set a=4;
---echo # Sic: a bug. Binlog did not register itself this time.
-call p_verify_status_increment(1, 0, 1, 0);
+--echo # Binlog does not register itself this time for other than the 1st
+--echo # statement of the transaction with MIXED/STATEMENT binlog_format.
+--echo # It needs registering with the ROW format. Therefore 1,0,2,2 are 
+--echo # the correct arguments to this test after bug#40221 fixed.
+call p_verify_status_increment(1, 0, 2, 2);
 release savepoint a;
 rollback;
 call p_verify_status_increment(0, 0, 0, 0);

=== modified file 'mysql-test/r/commit_1innodb.result'
--- a/mysql-test/r/commit_1innodb.result	2008-03-31 09:29:03 +0000
+++ b/mysql-test/r/commit_1innodb.result	2008-12-12 12:52:20 +0000
@@ -770,8 +770,11 @@ call p_verify_status_increment(0, 0, 0, 
 SUCCESS
 
 insert t1 set a=4;
-# Sic: a bug. Binlog did not register itself this time.
-call p_verify_status_increment(1, 0, 1, 0);
+# Binlog does not register itself this time for other than the 1st
+# statement of the transaction with MIXED/STATEMENT binlog_format.
+# It needs registering with the ROW format. Therefore 1,0,2,2 are 
+# the correct arguments to this test after bug#40221 fixed.
+call p_verify_status_increment(1, 0, 2, 2);
 SUCCESS
 
 release savepoint a;