diff options
| author | Andrei <andrei.elkin@mariadb.com> | 2023-01-30 19:26:16 +0200 |
|---|---|---|
| committer | Andrei <andrei.elkin@mariadb.com> | 2023-01-30 19:26:16 +0200 |
| commit | f23393ecdc58038ee9c3975a14700fedf9b5f126 (patch) | |
| tree | ecb9214c4baa109297855c6d94b3acb6052ecef2 | |
| parent | b2ea57e899b50cb428b6b58a21de5cfe1b191576 (diff) | |
| download | mariadb-git-bb-10.5-andrei.tar.gz | |
MDEV-30940: Revert "binlog.innodb_rc_insert_before_delete is disabled with MDEV-30490"bb-10.5-andrei
This reverts commit b2ea57e899b50cb428b6b58a21de5cfe1b191576,
as well as edits binlog.innodb_rc_insert_before_delete.test
to be safely runnable with any preceding test.
Note: manual 10.5 -> 10.6 merge is required to the test.
| -rw-r--r-- | mysql-test/suite/binlog/disabled.def | 1 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/t/innodb_rc_insert_before_delete.test | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/suite/binlog/disabled.def b/mysql-test/suite/binlog/disabled.def index 3a1f5472c85..888298bbb09 100644 --- a/mysql-test/suite/binlog/disabled.def +++ b/mysql-test/suite/binlog/disabled.def @@ -9,4 +9,3 @@ # Do not use any TAB characters for whitespace. # ############################################################################## -innodb_rc_insert_before_delete : MDEV-30490 2023-01-28 andrei see the MDEV description diff --git a/mysql-test/suite/binlog/t/innodb_rc_insert_before_delete.test b/mysql-test/suite/binlog/t/innodb_rc_insert_before_delete.test index 891a7b8ba2f..58974edc84c 100644 --- a/mysql-test/suite/binlog/t/innodb_rc_insert_before_delete.test +++ b/mysql-test/suite/binlog/t/innodb_rc_insert_before_delete.test @@ -4,6 +4,8 @@ --source include/have_binlog_format_mixed.inc --source include/count_sessions.inc +RESET MASTER; + # MDEV-30010 merely adds is a Read-Committed version MDEV-30225 test # solely to prove the RC isolation yields ROW binlog format as it is # supposed to: @@ -49,6 +51,7 @@ SET DEBUG_SYNC="lock_wait_suspend_thread_enter SIGNAL delete_started_waiting"; # to prepare showing interesting binlog events --let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1) +--let $binlog_file=query_get_value(SHOW MASTER STATUS, File, 1) BEGIN; --send UPDATE t SET sk = 200 WHERE sk = 100; # trx 2 |