diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2023-05-02 10:09:27 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2023-05-02 10:09:27 +0200 |
| commit | edd0b03e60f4cc666fbdf16e7b01b97188f2f887 (patch) | |
| tree | 1124df96972d5aea4a232d83680a8eaea50ed9df /sql/rpl_parallel.cc | |
| parent | ddcc9d2281de9fa68525a6808e9181bbd6bf98e0 (diff) | |
| parent | 55a53949beac6e212b1232d3628d96b9b8121a49 (diff) | |
| download | mariadb-git-edd0b03e60f4cc666fbdf16e7b01b97188f2f887.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/rpl_parallel.cc')
| -rw-r--r-- | sql/rpl_parallel.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sql/rpl_parallel.cc b/sql/rpl_parallel.cc index 746c923ba44..b550315d69f 100644 --- a/sql/rpl_parallel.cc +++ b/sql/rpl_parallel.cc @@ -2847,7 +2847,12 @@ rpl_parallel::do_event(rpl_group_info *serial_rgi, Log_event *ev, if (mode <= SLAVE_PARALLEL_MINIMAL || !(gtid_flags & Gtid_log_event::FL_GROUP_COMMIT_ID) || - e->last_commit_id != gtid_ev->commit_id) + e->last_commit_id != gtid_ev->commit_id || + /* + MULTI_BATCH is also set when the current gtid even being a member + of a commit group is flagged as DDL which disallows parallel. + */ + (gtid_flags & Gtid_log_event::FL_DDL)) flags|= group_commit_orderer::MULTI_BATCH; /* Make sure we do not attempt to run DDL in parallel speculatively. */ if (gtid_flags & Gtid_log_event::FL_DDL) |