diff options
| author | unknown <knielsen@knielsen-hq.org> | 2013-12-05 14:36:09 +0100 |
|---|---|---|
| committer | unknown <knielsen@knielsen-hq.org> | 2013-12-05 14:36:09 +0100 |
| commit | 4d6ee2d1197c0e5ebecd019d6625d7d05bf1cab8 (patch) | |
| tree | b22b03c739c9d47e0c64ff489ae97c9041f1a5f2 /sql/log.h | |
| parent | 4bce09c104f5c9ddc3600a77c9db44dfa7fd283c (diff) | |
| download | mariadb-git-4d6ee2d1197c0e5ebecd019d6625d7d05bf1cab8.tar.gz | |
MDEV-5363: Make parallel replication waits killable
Make wait_for_prior_commit killable, and handle the error if
killed.
Diffstat (limited to 'sql/log.h')
| -rw-r--r-- | sql/log.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.h b/sql/log.h index 73518d2594f..45381152d97 100644 --- a/sql/log.h +++ b/sql/log.h @@ -540,7 +540,7 @@ class MYSQL_BIN_LOG: public TC_LOG, private MYSQL_LOG void do_checkpoint_request(ulong binlog_id); void purge(); int write_transaction_or_stmt(group_commit_entry *entry, uint64 commit_id); - bool queue_for_group_commit(group_commit_entry *entry); + int queue_for_group_commit(group_commit_entry *entry); bool write_transaction_to_binlog_events(group_commit_entry *entry); void trx_group_commit_leader(group_commit_entry *leader); bool is_xidlist_idle_nolock(); |