Skip to content

Commit 24d27e3

Browse files
author
kostja@dipika.(none)
committed
Update Bug#12713 test results to take into account fixed bugs (29157, 33846)
1 parent 566ca2b commit 24d27e3

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

mysql-test/include/commit.inc

+4-9
Original file line numberDiff line numberDiff line change
@@ -421,15 +421,10 @@ call p_verify_status_increment(2, 2, 2, 2);
421421

422422
--echo # 4. Read-write statement: UPDATE, update 0 rows, 1 row matches WHERE
423423
--echo #
424-
--echo # Note the wrong Handler_prepare/Handler_commit count is due to
425-
--echo # Bug#29157 "UPDATE, changed rows incorrect" and
426-
--echo # Bug#Bug #33846 UPDATE word:Wrong 'Changed rows' if InnoDB, unique
427-
--echo # key and no rows qualify WHERE
428-
--echo #
429424
update t1 set a=2;
430-
call p_verify_status_increment(2, 2, 2, 2);
425+
call p_verify_status_increment(2, 2, 1, 0);
431426
commit;
432-
call p_verify_status_increment(2, 2, 2, 2);
427+
call p_verify_status_increment(2, 2, 1, 0);
433428

434429
--echo # 5. Read-write statement: UPDATE, update 0 rows, 0 rows match WHERE
435430
--echo #
@@ -483,9 +478,9 @@ call p_verify_status_increment(2, 2, 2, 2);
483478
--echo # 10. Read-write statement: REPLACE, change 0 rows.
484479
--echo #
485480
replace t1 set a=1;
486-
call p_verify_status_increment(2, 2, 2, 2);
481+
call p_verify_status_increment(2, 2, 1, 0);
487482
commit;
488-
call p_verify_status_increment(2, 2, 2, 2);
483+
call p_verify_status_increment(2, 2, 1, 0);
489484

490485
--echo # 11. Read-write statement: IODKU, change 1 row.
491486
--echo #

mysql-test/r/commit_1innodb.result

+4-9
Original file line numberDiff line numberDiff line change
@@ -416,17 +416,12 @@ SUCCESS
416416

417417
# 4. Read-write statement: UPDATE, update 0 rows, 1 row matches WHERE
418418
#
419-
# Note the wrong Handler_prepare/Handler_commit count is due to
420-
# Bug#29157 "UPDATE, changed rows incorrect" and
421-
# Bug#Bug #33846 UPDATE word:Wrong 'Changed rows' if InnoDB, unique
422-
# key and no rows qualify WHERE
423-
#
424419
update t1 set a=2;
425-
call p_verify_status_increment(2, 2, 2, 2);
420+
call p_verify_status_increment(2, 2, 1, 0);
426421
SUCCESS
427422

428423
commit;
429-
call p_verify_status_increment(2, 2, 2, 2);
424+
call p_verify_status_increment(2, 2, 1, 0);
430425
SUCCESS
431426

432427
# 5. Read-write statement: UPDATE, update 0 rows, 0 rows match WHERE
@@ -496,11 +491,11 @@ SUCCESS
496491
# 10. Read-write statement: REPLACE, change 0 rows.
497492
#
498493
replace t1 set a=1;
499-
call p_verify_status_increment(2, 2, 2, 2);
494+
call p_verify_status_increment(2, 2, 1, 0);
500495
SUCCESS
501496

502497
commit;
503-
call p_verify_status_increment(2, 2, 2, 2);
498+
call p_verify_status_increment(2, 2, 1, 0);
504499
SUCCESS
505500

506501
# 11. Read-write statement: IODKU, change 1 row.

0 commit comments

Comments
 (0)