bk commit into 5.1 tree (kostja:1.2545) BUG#12713

[konstantin]

Below is the list of changes that have just been committed into a local
5.1 repository of kostja.  When kostja does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-02-27 18:38:17+03:00, kostja@dipika.(none) +2 -0
  Update Bug#12713 test results to take into account fixed bugs (29157, 33846)

  mysql-test/include/commit.inc@stripped, 2008-02-27 18:38:13+03:00, kostja@dipika.(none) +4 -9
    Update Bug#12713 test results to take into account fixed bugs (29157, 33846)

  mysql-test/r/commit_1innodb.result@stripped, 2008-02-27 18:38:13+03:00, kostja@dipika.(none)
+4 -9
    Update Bug#12713 test results to take into account fixed bugs (29157, 33846)

diff -Nrup a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc
--- a/mysql-test/include/commit.inc	2008-02-19 14:42:59 +03:00
+++ b/mysql-test/include/commit.inc	2008-02-27 18:38:13 +03:00
@@ -421,15 +421,10 @@ call p_verify_status_increment(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, 
 --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 -Nrup a/mysql-test/r/commit_1innodb.result b/mysql-test/r/commit_1innodb.result
--- a/mysql-test/r/commit_1innodb.result	2008-02-19 14:42:59 +03:00
+++ b/mysql-test/r/commit_1innodb.result	2008-02-27 18:38:13 +03:00
@@ -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.