diff options
| author | Andrei Elkin <aelkin@mysql.com> | 2008-12-12 14:52:20 +0200 |
|---|---|---|
| committer | Andrei Elkin <aelkin@mysql.com> | 2008-12-12 14:52:20 +0200 |
| commit | 5753307aefaf378db280fd53e2e58fa7ce3d2295 (patch) | |
| tree | cb66fc9d5bd0d013819e20784a2d9abe2e4a97f4 /mysql-test | |
| parent | a4467c97981714631deef5685d6d2f790e877695 (diff) | |
| download | mariadb-git-5753307aefaf378db280fd53e2e58fa7ce3d2295.tar.gz | |
Bug #41383 Test commit1_innodb fails with binlog-format=row
The test explicitly warned on existence of a bug in its 27th part.
The expected values of prepare and commit counters changed, corrected, by
fixes to bug#40221.
Notice, that binlog does not have to register for a statement with
the statement binlog-format because the statement rollback does not need
to do anything in that mode. It's not so with the ROW format which was
bug#40221 concern.
Fixed with correcting the expected values of the mentioned counters and
explained that with comments in the test.
mysql-test/include/commit.inc:
Removing `Sic' that warned on a bug (The one is bug#40221).
Correcting the expected values of prepare and commit counters due to fixes to bug#40221.
mysql-test/r/commit_1innodb.result:
results changed.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/include/commit.inc | 7 | ||||
| -rw-r--r-- | mysql-test/r/commit_1innodb.result | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/mysql-test/include/commit.inc b/mysql-test/include/commit.inc index 98f9c93b25a..48b0eac12e5 100644 --- a/mysql-test/include/commit.inc +++ b/mysql-test/include/commit.inc @@ -671,8 +671,11 @@ call p_verify_status_increment(2, 2, 2, 2); savepoint a; call p_verify_status_increment(0, 0, 0, 0); insert t1 set a=4; ---echo # Sic: a bug. Binlog did not register itself this time. -call p_verify_status_increment(1, 0, 1, 0); +--echo # Binlog does not register itself this time for other than the 1st +--echo # statement of the transaction with MIXED/STATEMENT binlog_format. +--echo # It needs registering with the ROW format. Therefore 1,0,2,2 are +--echo # the correct arguments to this test after bug#40221 fixed. +call p_verify_status_increment(1, 0, 2, 2); release savepoint a; rollback; call p_verify_status_increment(0, 0, 0, 0); diff --git a/mysql-test/r/commit_1innodb.result b/mysql-test/r/commit_1innodb.result index a2c1eb9a82e..766b920f630 100644 --- a/mysql-test/r/commit_1innodb.result +++ b/mysql-test/r/commit_1innodb.result @@ -770,8 +770,11 @@ call p_verify_status_increment(0, 0, 0, 0); SUCCESS insert t1 set a=4; -# Sic: a bug. Binlog did not register itself this time. -call p_verify_status_increment(1, 0, 1, 0); +# Binlog does not register itself this time for other than the 1st +# statement of the transaction with MIXED/STATEMENT binlog_format. +# It needs registering with the ROW format. Therefore 1,0,2,2 are +# the correct arguments to this test after bug#40221 fixed. +call p_verify_status_increment(1, 0, 2, 2); SUCCESS release savepoint a; |