diff options
| author | Rohit Kalhans <rohit.kalhans@oracle.com> | 2011-09-30 15:16:35 +0530 |
|---|---|---|
| committer | Rohit Kalhans <rohit.kalhans@oracle.com> | 2011-09-30 15:16:35 +0530 |
| commit | 0e6afc7f6b1fef4e639f2012332c46301d3af1cb (patch) | |
| tree | f908bd6b03beedcdaed83073ecc0d75163234f86 /mysql-test | |
| parent | 546cea3fd2bdcc76ab395686ec9a20fa0327e66f (diff) | |
| download | mariadb-git-0e6afc7f6b1fef4e639f2012332c46301d3af1cb.tar.gz | |
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.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/commit.inc | 6 | ||||
| -rw-r--r-- | mysql-test/r/commit_1innodb.result | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc index 9df1571a849..e84ad0f940d 100644 --- a/mysql-test/include/commit.inc +++ b/mysql-test/include/commit.inc @@ -521,7 +521,9 @@ commit; call p_verify_status_increment(2, 2, 2, 2); --echo # 15. Read-write statement: UPDATE IGNORE, change 0 rows. --echo # +--disable_warnings update ignore t1 set a=2 where a=1; +--enable_warnings call p_verify_status_increment(2, 2, 1, 0); commit; call p_verify_status_increment(2, 2, 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 # +--disable_warnings update t1 set a=2 where a=f1()+10; +--enable_warnings call p_verify_status_increment(2, 0, 1, 0); commit; call p_verify_status_increment(2, 0, 1, 0); @@ -703,7 +707,9 @@ call p_verify_status_increment(4, 4, 4, 4); --echo # insert into t2 select a from t1; commit; +--disable_warnings replace into t2 select a from t1; +--enable_warnings commit; call p_verify_status_increment(8, 8, 8, 8); # diff --git a/mysql-test/r/commit_1innodb.result b/mysql-test/r/commit_1innodb.result index 33fad9a0146..fb1552b6c28 100644 --- a/mysql-test/r/commit_1innodb.result +++ b/mysql-test/r/commit_1innodb.result @@ -549,8 +549,6 @@ SUCCESS # 15. Read-write statement: UPDATE IGNORE, change 0 rows. # 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); SUCCESS @@ -816,8 +814,6 @@ SUCCESS insert into t2 select a from t1; commit; 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; call p_verify_status_increment(8, 8, 8, 8); SUCCESS |