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 tag 'mariadb-5.5.47' into 5.5-galera

Browse Source
This commit is contained in:
Nirbhay Choubey
2015-12-10 13:00:08 -05:00
parent 278ff1661a d67aacb4fb
commit ca07ee85ea
122 changed files with 1962 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/log.cc
View File

@@ -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);
}