diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-09-30 17:27:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-09-30 17:27:38 +0200 |
| commit | 2ab52cc0e5c3cc792608a518625a08e6d3734ce4 (patch) | |
| tree | 83126a8b46712359b6e5526ed9e2cc8b52f5de8b | |
| parent | 194cc3680593cad3856d112638e858ddc6928dff (diff) | |
| download | mariadb-git-2ab52cc0e5c3cc792608a518625a08e6d3734ce4.tar.gz | |
update the test after merge
after d7d3ad698abd 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.
| -rw-r--r-- | mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result b/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result index 13de367a9b8..8425e0ad17a 100644 --- a/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result +++ b/mysql-test/suite/binlog/r/binlog_truncate_multi_engine.result @@ -145,7 +145,7 @@ INSERT INTO t2 VALUES (1, REPEAT("x", 1)); BEGIN; INSERT INTO t2 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; connection default; SET DEBUG_SYNC= "now WAIT_FOR con1_ready"; diff --git a/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test b/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test index 896bc11686b..12b0a743916 100644 --- a/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test +++ b/mysql-test/suite/binlog/t/binlog_truncate_multi_engine.test @@ -47,7 +47,7 @@ CREATE TABLE t2 (a INT PRIMARY KEY, b MEDIUMTEXT) ENGINE=rocksdb; --let $case = "C" --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. --let $shutdown_timeout= --let $restart_parameters = --rpl-semi-sync-slave-enabled=1 --sync-binlog=1 |