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 branch '11.8' into main

Browse Source
This commit is contained in:
Sergei Golubchik
2025-04-18 12:07:02 +02:00
parent cb2d6abae1 805e7ca3ad
commit 9b824e62d4
871 changed files with 11314 additions and 6371 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_class.h
View File

@ -2647,8 +2647,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;
}
}
@ -2699,6 +2699,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();