MDEV-7588 Add thd_wait_begin/thd_wait_end to wait_for_binlog_endpos

2f8c84fd · Vladislav Vaintroub · 73fc19bb · 2f8c84fd
Commit 2f8c84fd authored Nov 24, 2015 by Vladislav Vaintroub
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

sql/log.cc sql/log.cc +2 -0

No files found.
--- a/sql/log.cc
+++ b/sql/log.cc
@@ -8049,12 +8049,14 @@ int MYSQL_BIN_LOG::wait_for_update_binlog_end_pos(THD* thd,
  int ret= 0;
  DBUG_ENTER("wait_for_update_binlog_end_pos");

+  thd_wait_begin(thd, THD_WAIT_BINLOG);
  mysql_mutex_assert_owner(get_binlog_end_pos_lock());
  if (!timeout)
    mysql_cond_wait(&update_cond, get_binlog_end_pos_lock());
  else
    ret= mysql_cond_timedwait(&update_cond, get_binlog_end_pos_lock(),
                              timeout);
+  thd_wait_end(thd);
  DBUG_RETURN(ret);
 }