Skip to content

Commit f8a85af

Browse files
andrelkinsanja-byelkin
authored andcommitted
MDEV-30940: Revert "binlog.innodb_rc_insert_before_delete is disabled with MDEV-30490"
This reverts commit b2ea57e, 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.
1 parent b2ea57e commit f8a85af

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

mysql-test/suite/binlog/disabled.def

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,3 @@
99
# Do not use any TAB characters for whitespace.
1010
#
1111
##############################################################################
12-
innodb_rc_insert_before_delete : MDEV-30490 2023-01-28 andrei see the MDEV description

mysql-test/suite/binlog/t/innodb_rc_insert_before_delete.test

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
--source include/have_binlog_format_mixed.inc
55
--source include/count_sessions.inc
66

7+
RESET MASTER;
8+
79
# MDEV-30010 merely adds is a Read-Committed version MDEV-30225 test
810
# solely to prove the RC isolation yields ROW binlog format as it is
911
# supposed to:
@@ -49,6 +51,7 @@ SET DEBUG_SYNC="lock_wait_suspend_thread_enter SIGNAL delete_started_waiting";
4951

5052
# to prepare showing interesting binlog events
5153
--let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1)
54+
--let $binlog_file=query_get_value(SHOW MASTER STATUS, File, 1)
5255
BEGIN;
5356
--send UPDATE t SET sk = 200 WHERE sk = 100; # trx 2
5457

0 commit comments

Comments
 (0)