diff options
| author | Andrei <andrei.elkin@mariadb.com> | 2023-05-02 15:52:36 +0300 |
|---|---|---|
| committer | Andrei <andrei.elkin@mariadb.com> | 2023-05-02 15:52:36 +0300 |
| commit | 495f1ecac20dd94719ec24332c4c56c806b54269 (patch) | |
| tree | b29a870e07568fcbf9bbce71ee039d981d0254f1 /mysql-test | |
| parent | edf8ce5b9741520cd5b3e559af2dd7cace6b4af9 (diff) | |
| download | mariadb-git-495f1ecac20dd94719ec24332c4c56c806b54269.tar.gz | |
MDEV-29621 manual merge from 10.4 -> 10.5
1. log_event.cc stuff should go into log_event_server.cc
2. the test's wait condition is textually different in 10.5, fixed.
3. pre-exec 'optimistic' global var value is correct for 10.5 indeed.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/rpl/r/rpl_parallel_seq.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/rpl/t/rpl_parallel_seq.test | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/suite/rpl/r/rpl_parallel_seq.result b/mysql-test/suite/rpl/r/rpl_parallel_seq.result index 60061049ed4..ae4041f470d 100644 --- a/mysql-test/suite/rpl/r/rpl_parallel_seq.result +++ b/mysql-test/suite/rpl/r/rpl_parallel_seq.result @@ -74,7 +74,7 @@ connection slave; include/stop_slave.inc SET debug_sync = RESET; SET @@global.slave_parallel_threads= 0; -SET @@global.slave_parallel_mode= conservative; +SET @@global.slave_parallel_mode= optimistic; SET @@global.debug_dbug = ""; SET @@global.gtid_strict_mode=0; include/start_slave.inc diff --git a/mysql-test/suite/rpl/t/rpl_parallel_seq.test b/mysql-test/suite/rpl/t/rpl_parallel_seq.test index 741859bc588..2a4fd96ff34 100644 --- a/mysql-test/suite/rpl/t/rpl_parallel_seq.test +++ b/mysql-test/suite/rpl/t/rpl_parallel_seq.test @@ -28,7 +28,7 @@ SET @@global.slave_parallel_mode=optimistic; SET @@global.debug_dbug="+d,hold_worker_on_schedule"; --source include/start_slave.inc ---let $wait_condition= SELECT count(*) = 1 FROM information_schema.processlist WHERE state LIKE "Waiting for prior transaction to start commit before starting%" +--let $wait_condition= SELECT count(*) = 1 FROM information_schema.processlist WHERE state LIKE "Waiting for prior transaction to start commit" --source include/wait_condition.inc SET DEBUG_SYNC = 'now SIGNAL continue_worker'; |