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 10.6 into 10.11

Browse Source
This commit is contained in:
Marko Mäkelä
2025-03-27 08:01:47 +02:00
parent ba81009f63 191209d8ab
commit ab0f2a00b6
463 changed files with 4278 additions and 1958 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
sql/sql_class.cc
View File

@@ -8381,6 +8381,24 @@ end:
}
void
wait_for_commit::prior_commit_error(THD *thd)
{
/*
Only raise a "prior commit failed" error if we didn't already raise
an error.
The ER_PRIOR_COMMIT_FAILED is just an internal mechanism to ensure that a
transaction does not commit successfully if a prior commit failed, so that
the parallel replication worker threads stop in an orderly fashion when
one of them get an error. Thus, if another worker already got another real
error, overriding it with ER_PRIOR_COMMIT_FAILED is not useful.
*/
if (!thd->get_stmt_da()->is_set())
my_error(ER_PRIOR_COMMIT_FAILED, MYF(0));
}
/*
Wakeup anyone waiting for us to have committed.