diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-10 13:00:08 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-12-10 13:00:08 -0500 |
| commit | ca07ee85ea28d4b820498535508c6b23f089c22c (patch) | |
| tree | 1445f647e7b3237031b04339b5be69a183e761eb /sql/log.cc | |
| parent | 278ff1661a9fcf690b6b7604eb889fd287e6246a (diff) | |
| parent | d67aacb4fbb449ffa8db4e3d70fe8756d62b5222 (diff) | |
| download | mariadb-git-ca07ee85ea28d4b820498535508c6b23f089c22c.tar.gz | |
Merge tag 'mariadb-5.5.47' into 5.5-galera
Diffstat (limited to 'sql/log.cc')
| -rw-r--r-- | sql/log.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/log.cc b/sql/log.cc index 2f64474ce3f..f9756e6c450 100644 --- a/sql/log.cc +++ b/sql/log.cc @@ -6440,11 +6440,13 @@ int MYSQL_BIN_LOG::wait_for_update_bin_log(THD* thd, int ret= 0; DBUG_ENTER("wait_for_update_bin_log"); + thd_wait_begin(thd, THD_WAIT_BINLOG); if (!timeout) mysql_cond_wait(&update_cond, &LOCK_log); else ret= mysql_cond_timedwait(&update_cond, &LOCK_log, const_cast<struct timespec *>(timeout)); + thd_wait_end(thd); DBUG_RETURN(ret); } |