database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

update the test after merge

Browse Source 
after d7d3ad698a debug_sync waits are no longer interrupted by
soft kills that server shutdown is using. Luckily in this test
there's no need to wait, it wants the commit to be properly completed,
fully committed in both engines.
This commit is contained in:
Sergei Golubchik
2022-09-30 17:27:38 +02:00
parent 194cc36805
commit 2ab52cc0e5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result
View File

@@ -145,7 +145,7 @@ INSERT INTO t2 VALUES (1, REPEAT("x", 1));
BEGIN; BEGIN;
INSERT INTO t2 VALUES (2, REPEAT("x", 4100)); INSERT INTO t2 VALUES (2, REPEAT("x", 4100));
INSERT INTO t1 VALUES (2, REPEAT("x", 4100)); INSERT INTO t1 VALUES (2, REPEAT("x", 4100));
SET DEBUG_SYNC= "commit_after_run_commit_ordered SIGNAL con1_ready WAIT_FOR signal_no_signal"; SET DEBUG_SYNC= "commit_after_run_commit_ordered SIGNAL con1_ready";
COMMIT; COMMIT;
connection default; connection default;
SET DEBUG_SYNC= "now WAIT_FOR con1_ready"; SET DEBUG_SYNC= "now WAIT_FOR con1_ready";

2
mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test
View File

@@ -47,7 +47,7 @@ CREATE TABLE t2 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=rocksdb;
--let $case = "C" --let $case = "C"
--let $description= "both engines have committed its transaction branch" --let $description= "both engines have committed its transaction branch"
--let $debug_sync_action = "commit_after_run_commit_ordered SIGNAL con1_ready WAIT_FOR signal_no_signal" --let $debug_sync_action = "commit_after_run_commit_ordered SIGNAL con1_ready"
# Hold off after both engines have committed. The server is shut down. # Hold off after both engines have committed. The server is shut down.
--let $shutdown_timeout= --let $shutdown_timeout=
--let $restart_parameters = --rpl-semi-sync-slave-enabled=1 --sync-binlog=1 --let $restart_parameters = --rpl-semi-sync-slave-enabled=1 --sync-binlog=1