database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge MDEV-8725 into 10.1

Browse Source
This commit is contained in:
Kristian Nielsen
2015-09-02 10:53:37 +02:00
parent 4f37a861c9 09bfaf3a13
commit ef82cb7c2c
4 changed files with 76 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/log.cc
View File

@@ -7936,14 +7936,13 @@ void
MYSQL_BIN_LOG::binlog_trigger_immediate_group_commit()
{
group_commit_entry *head;
mysql_mutex_lock(&LOCK_prepare_ordered);
mysql_mutex_assert_owner(&LOCK_prepare_ordered);
head= group_commit_queue;
if (head)
{
head->thd->has_waiter= true;
mysql_cond_signal(&COND_prepare_ordered);
}
mysql_mutex_unlock(&LOCK_prepare_ordered);
}
@@ -7962,9 +7961,11 @@ binlog_report_wait_for(THD *thd1, THD *thd2)
{
if (opt_binlog_commit_wait_count == 0)
return;
mysql_mutex_lock(&LOCK_prepare_ordered);
thd2->has_waiter= true;
if (thd2->waiting_on_group_commit)
mysql_bin_log.binlog_trigger_immediate_group_commit();
mysql_mutex_unlock(&LOCK_prepare_ordered);
}