summaryrefslogtreecommitdiff
path: root/sql/log.cc
diff options
context:
space:
mode:
authorKristian Nielsen <knielsen@knielsen-hq.org>2016-08-16 12:34:58 +0200
committerKristian Nielsen <knielsen@knielsen-hq.org>2016-08-16 12:34:58 +0200
commit48fbb2bf07515425edaf511ac2e17a575ae37713 (patch)
tree60948875788e09edab518c81c4bfb6b1f916e0ae /sql/log.cc
parenta8c2f68fb8c7915317b12236c21a35bdd41d2092 (diff)
downloadmariadb-git-48fbb2bf07515425edaf511ac2e17a575ae37713.tar.gz
MDEV-10553: Semi-sync replication hangs when master opens new binlog file
In the AFTER_SYNC case, semi-sync was taking the binlog file name from the wrong place, so around binlog rotation it could be using the new name with a position belonging to the previous binlog file name. Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
Diffstat (limited to 'sql/log.cc')
-rw-r--r--sql/log.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log.cc b/sql/log.cc
index 7efec982de7..b77a6b32016 100644
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -7712,7 +7712,7 @@ MYSQL_BIN_LOG::trx_group_commit_leader(group_commit_entry *leader)
last= current->next == NULL;
if (!current->error &&
RUN_HOOK(binlog_storage, after_sync,
- (current->thd, log_file_name,
+ (current->thd, current->cache_mngr->last_commit_pos_file,
current->cache_mngr->last_commit_pos_offset,
first, last)))
{