Commit 0e6afc7f authored by Rohit Kalhans's avatar Rohit Kalhans

BUG#11758262 BUG#13043055

Problem: commit_1innodb fails on pb2 after the patch for BUG#11758262
Background: Certain statements threw warnings only in statement mode causing
the result cintent mismatch.

Fix: disabled warnings from the statements.
parent 546cea3f
...@@ -521,7 +521,9 @@ commit; ...@@ -521,7 +521,9 @@ commit;
call p_verify_status_increment(2, 2, 2, 2); call p_verify_status_increment(2, 2, 2, 2);
--echo # 15. Read-write statement: UPDATE IGNORE, change 0 rows. --echo # 15. Read-write statement: UPDATE IGNORE, change 0 rows.
--echo # --echo #
--disable_warnings
update ignore t1 set a=2 where a=1; update ignore t1 set a=2 where a=1;
--enable_warnings
call p_verify_status_increment(2, 2, 1, 0); call p_verify_status_increment(2, 2, 1, 0);
commit; commit;
call p_verify_status_increment(2, 2, 1, 0); call p_verify_status_increment(2, 2, 1, 0);
...@@ -603,7 +605,9 @@ call p_verify_status_increment(2, 0, 1, 0); ...@@ -603,7 +605,9 @@ call p_verify_status_increment(2, 0, 1, 0);
--echo # 21. Read-write statement: UPDATE, change 0 (transactional) rows. --echo # 21. Read-write statement: UPDATE, change 0 (transactional) rows.
--echo # --echo #
--disable_warnings
update t1 set a=2 where a=f1()+10; update t1 set a=2 where a=f1()+10;
--enable_warnings
call p_verify_status_increment(2, 0, 1, 0); call p_verify_status_increment(2, 0, 1, 0);
commit; commit;
call p_verify_status_increment(2, 0, 1, 0); call p_verify_status_increment(2, 0, 1, 0);
...@@ -703,7 +707,9 @@ call p_verify_status_increment(4, 4, 4, 4); ...@@ -703,7 +707,9 @@ call p_verify_status_increment(4, 4, 4, 4);
--echo # --echo #
insert into t2 select a from t1; insert into t2 select a from t1;
commit; commit;
--disable_warnings
replace into t2 select a from t1; replace into t2 select a from t1;
--enable_warnings
commit; commit;
call p_verify_status_increment(8, 8, 8, 8); call p_verify_status_increment(8, 8, 8, 8);
# #
......
...@@ -549,8 +549,6 @@ SUCCESS ...@@ -549,8 +549,6 @@ SUCCESS
# 15. Read-write statement: UPDATE IGNORE, change 0 rows. # 15. Read-write statement: UPDATE IGNORE, change 0 rows.
# #
update ignore t1 set a=2 where a=1; update ignore t1 set a=2 where a=1;
Warnings:
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. UPDATE IGNORE is unsafe because the order in which rows are updated determines which (if any) rows are ignored. This order cannot be predicted and may differ on master and the slave.
call p_verify_status_increment(2, 2, 1, 0); call p_verify_status_increment(2, 2, 1, 0);
SUCCESS SUCCESS
...@@ -816,8 +814,6 @@ SUCCESS ...@@ -816,8 +814,6 @@ SUCCESS
insert into t2 select a from t1; insert into t2 select a from t1;
commit; commit;
replace into t2 select a from t1; replace into t2 select a from t1;
Warnings:
Note 1592 Unsafe statement written to the binary log using statement format since BINLOG_FORMAT = STATEMENT. REPLACE... SELECT is unsafe because the order in which rows are retrieved by the SELECT determines which (if any) rows are replaced. This order cannot be predicted and may differ on master and the slave.
commit; commit;
call p_verify_status_increment(8, 8, 8, 8); call p_verify_status_increment(8, 8, 8, 8);
SUCCESS SUCCESS
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment