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

Merge 11.4 into 11.8

Browse Source
This commit is contained in:
Marko Mäkelä
2025-04-02 14:07:01 +03:00
parent 6e4fa7e5a1 3ae8f114e2
commit bb1d88b6dc
786 changed files with 10229 additions and 5958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sql/rpl_parallel.cc
View File

@@ -153,14 +153,12 @@ static void
finish_event_group(rpl_parallel_thread *rpt, uint64 sub_id,
rpl_parallel_entry *entry, rpl_group_info *rgi)
{
THD *thd= rpt->thd;
wait_for_commit *wfc= &rgi->commit_orderer;
int err;
if (rgi->get_finish_event_group_called())
return;
thd->get_stmt_da()->set_overwrite_status(true);
THD *thd= rpt->thd;
wait_for_commit *wfc= &rgi->commit_orderer;
int err;
if (unlikely(rgi->worker_error))
{
@@ -320,10 +318,6 @@ finish_event_group(rpl_parallel_thread *rpt, uint64 sub_id,
wait_for_pending_deadlock_kill(thd, rgi);
thd->clear_error();
thd->reset_killed();
/*
Would do thd->get_stmt_da()->set_overwrite_status(false) here, but
reset_diagnostics_area() already does that.
*/
thd->get_stmt_da()->reset_diagnostics_area();
wfc->wakeup_subsequent_commits(rgi->worker_error);
rgi->did_mark_start_commit= false;
@@ -1601,9 +1595,7 @@ handle_rpl_parallel_thread(void *arg)
else
{
delete qev->ev;
thd->get_stmt_da()->set_overwrite_status(true);
err= thd->wait_for_prior_commit();
thd->get_stmt_da()->set_overwrite_status(false);
}
end_of_group=