From 0122a138e4b8da24fc0f943fad9f610ad5b6f4d2 Mon Sep 17 00:00:00 2001
From: Rohit Kalhans <rohit.kalhans@oracle.com>
Date: Mon, 3 Oct 2011 16:05:52 +0530
Subject: [PATCH] BUG#11758262 BUG#13043055: Fix for commit_1innodb failure on
 pb2.

Background: as status increment differs for an unsafe statement
when logged in stmt and row format,  mtr throws a content mismatch
error.

Fix:  call p_verify_status_increment with different arguments
for loging format as stmt and row/mixed and disable query log.
---
 mysql-test/include/commit.inc      | 26 ++++++++++++++++++++++++--
 mysql-test/r/commit_1innodb.result |  2 --
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc
index e84ad0f940d..fdb9ef1f563 100644
--- a/mysql-test/include/commit.inc
+++ b/mysql-test/include/commit.inc
@@ -524,9 +524,31 @@ call p_verify_status_increment(2, 2, 2, 2);
 --disable_warnings
 update ignore t1 set a=2 where a=1;
 --enable_warnings
-call p_verify_status_increment(2, 2, 1, 0);
+if (`select @@binlog_format = 'STATEMENT'`)
+{
+  --disable_query_log
+  call p_verify_status_increment(2, 2, 1, 0);
+  --enable_query_log
+}
+if (`select @@binlog_format != 'STATEMENT'`)
+{
+  --disable_query_log
+  call p_verify_status_increment(1, 0, 1, 0);
+  --enable_query_log
+}
 commit;
-call p_verify_status_increment(2, 2, 1, 0);
+if (`select @@binlog_format = 'STATEMENT'`)
+{
+  --disable_query_log
+  call p_verify_status_increment(2, 2, 1, 0);
+  --enable_query_log
+}
+if (`select @@binlog_format != 'STATEMENT'`)
+{
+  --disable_query_log
+  call p_verify_status_increment(1, 0, 1, 0);
+  --enable_query_log
+}
 --echo #
 --echo # Create a stored function that modifies a
 --echo # non-transactional table. Demonstrate that changes in
diff --git a/mysql-test/r/commit_1innodb.result b/mysql-test/r/commit_1innodb.result
index fb1552b6c28..3e3d75f66e4 100644
--- a/mysql-test/r/commit_1innodb.result
+++ b/mysql-test/r/commit_1innodb.result
@@ -549,11 +549,9 @@ SUCCESS
 # 15. Read-write statement: UPDATE IGNORE, change 0 rows. 
 #
 update ignore t1 set a=2 where a=1;
-call p_verify_status_increment(2, 2, 1, 0);
 SUCCESS
 
 commit;
-call p_verify_status_increment(2, 2, 1, 0);
 SUCCESS
 
 #