diff options
author | Alfranio Correia <alfranio.correia@oracle.com> | 2011-01-31 10:08:58 +0000 |
---|---|---|
committer | Alfranio Correia <alfranio.correia@oracle.com> | 2011-01-31 10:08:58 +0000 |
commit | ee36bd7f468403489eca2a96fdafce787c30c204 (patch) | |
tree | 4aa44e1ab172deab248d957a7fb866564b14d713 /mysql-test/include/commit.inc | |
parent | f6258063c6d85375b7044302cb96650522096743 (diff) | |
parent | 8ce9b992462f0d2ef5e435e4ecda4700fa7db652 (diff) | |
download | mariadb-git-ee36bd7f468403489eca2a96fdafce787c30c204.tar.gz |
merge mysql-5.1 (local) --> mysql-5.1
Diffstat (limited to 'mysql-test/include/commit.inc')
-rw-r--r-- | mysql-test/include/commit.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc index d412eae8364..7924f9bc96f 100644 --- a/mysql-test/include/commit.inc +++ b/mysql-test/include/commit.inc @@ -502,16 +502,16 @@ call p_verify_status_increment(2, 2, 2, 2); --echo # 12. Read-write statement: IODKU, change 0 rows. --echo # insert t1 set a=2 on duplicate key update a=2; -call p_verify_status_increment(1, 0, 1, 0); +call p_verify_status_increment(2, 2, 1, 0); commit; -call p_verify_status_increment(1, 0, 1, 0); +call p_verify_status_increment(2, 2, 1, 0); --echo # 13. Read-write statement: INSERT IGNORE, change 0 rows. --echo # insert ignore t1 set a=2; -call p_verify_status_increment(1, 0, 1, 0); +call p_verify_status_increment(2, 2, 1, 0); commit; -call p_verify_status_increment(1, 0, 1, 0); +call p_verify_status_increment(2, 2, 1, 0); --echo # 14. Read-write statement: INSERT IGNORE, change 1 row. --echo # |