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

Merge 10.4 into 10.5

Browse Source
This commit is contained in:
Marko Mäkelä
2023-09-11 11:29:31 +03:00
parent b08474435f 65c99207e0
commit f8f7d9de2c
83 changed files with 1045 additions and 22797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_class.cc
View File

@ -7874,6 +7874,7 @@ wait_for_commit::reinit()
wakeup_error= 0;
wakeup_subsequent_commits_running= false;
commit_started= false;
wakeup_blocked= false;
#ifdef SAFE_MUTEX
/*
When using SAFE_MUTEX, the ordering between taking the LOCK_wait_commit
@ -8147,6 +8148,9 @@ wait_for_commit::wakeup_subsequent_commits2(int wakeup_error)
{
wait_for_commit *waiter;
if (unlikely(wakeup_blocked))
return;
mysql_mutex_lock(&LOCK_wait_commit);
wakeup_subsequent_commits_running= true;
waiter= subsequent_commits_list;