database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge 10.11 into 11.4

Browse Source
This commit is contained in:
Marko Mäkelä
2025-03-28 13:55:21 +02:00
parent 3bbe11acd9 7335e9b8ef
commit f5bd250f5b
679 changed files with 8065 additions and 5646 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_class.h
View File

@ -2553,8 +2553,8 @@ struct wait_for_commit
return wait_for_prior_commit2(thd, allow_kill);
else
{
if (wakeup_error)
my_error(ER_PRIOR_COMMIT_FAILED, MYF(0));
if (unlikely(wakeup_error))
prior_commit_error(thd);
return wakeup_error;
}
}
@ -2605,6 +2605,7 @@ struct wait_for_commit
void wakeup(int wakeup_error);
int wait_for_prior_commit2(THD *thd, bool allow_kill);
void prior_commit_error(THD *thd);
void wakeup_subsequent_commits2(int wakeup_error);
void unregister_wait_for_prior_commit2();