diff options
| author | unknown <kostja@dipika.(none)> | 2008-02-27 18:38:17 +0300 |
|---|---|---|
| committer | unknown <kostja@dipika.(none)> | 2008-02-27 18:38:17 +0300 |
| commit | 6dd9666d0f8bc40dbba44688c87a5dec1f08cef4 (patch) | |
| tree | 45614f6eea69e9c50accf37206d803dde981156a /mysql-test | |
| parent | fe7035a73ab096efa65e071793e61b3549168f8d (diff) | |
| download | mariadb-git-6dd9666d0f8bc40dbba44688c87a5dec1f08cef4.tar.gz | |
Update Bug#12713 test results to take into account fixed bugs (29157, 33846)
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/commit.inc | 13 | ||||
| -rw-r--r-- | mysql-test/r/commit_1innodb.result | 13 |
2 files changed, 8 insertions, 18 deletions
diff --git a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc index 770871fbcca..9bd11bf33c1 100644 --- a/mysql-test/include/commit.inc +++ b/mysql-test/include/commit.inc @@ -421,15 +421,10 @@ call p_verify_status_increment(2, 2, 2, 2); --echo # 4. Read-write statement: UPDATE, update 0 rows, 1 row matches WHERE --echo # ---echo # Note the wrong Handler_prepare/Handler_commit count is due to ---echo # Bug#29157 "UPDATE, changed rows incorrect" and ---echo # Bug#Bug #33846 UPDATE word:Wrong 'Changed rows' if InnoDB, unique ---echo # key and no rows qualify WHERE ---echo # update t1 set a=2; -call p_verify_status_increment(2, 2, 2, 2); +call p_verify_status_increment(2, 2, 1, 0); commit; -call p_verify_status_increment(2, 2, 2, 2); +call p_verify_status_increment(2, 2, 1, 0); --echo # 5. Read-write statement: UPDATE, update 0 rows, 0 rows match WHERE --echo # @@ -483,9 +478,9 @@ call p_verify_status_increment(2, 2, 2, 2); --echo # 10. Read-write statement: REPLACE, change 0 rows. --echo # replace t1 set a=1; -call p_verify_status_increment(2, 2, 2, 2); +call p_verify_status_increment(2, 2, 1, 0); commit; -call p_verify_status_increment(2, 2, 2, 2); +call p_verify_status_increment(2, 2, 1, 0); --echo # 11. Read-write statement: IODKU, change 1 row. --echo # diff --git a/mysql-test/r/commit_1innodb.result b/mysql-test/r/commit_1innodb.result index 87f4fc32bc8..8598e231861 100644 --- a/mysql-test/r/commit_1innodb.result +++ b/mysql-test/r/commit_1innodb.result @@ -416,17 +416,12 @@ SUCCESS # 4. Read-write statement: UPDATE, update 0 rows, 1 row matches WHERE # -# Note the wrong Handler_prepare/Handler_commit count is due to -# Bug#29157 "UPDATE, changed rows incorrect" and -# Bug#Bug #33846 UPDATE word:Wrong 'Changed rows' if InnoDB, unique -# key and no rows qualify WHERE -# update t1 set a=2; -call p_verify_status_increment(2, 2, 2, 2); +call p_verify_status_increment(2, 2, 1, 0); SUCCESS commit; -call p_verify_status_increment(2, 2, 2, 2); +call p_verify_status_increment(2, 2, 1, 0); SUCCESS # 5. Read-write statement: UPDATE, update 0 rows, 0 rows match WHERE @@ -496,11 +491,11 @@ SUCCESS # 10. Read-write statement: REPLACE, change 0 rows. # replace t1 set a=1; -call p_verify_status_increment(2, 2, 2, 2); +call p_verify_status_increment(2, 2, 1, 0); SUCCESS commit; -call p_verify_status_increment(2, 2, 2, 2); +call p_verify_status_increment(2, 2, 1, 0); SUCCESS # 11. Read-write statement: IODKU, change 1 row. |