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-10.0.23' into 10.0-galera

Browse Source
This commit is contained in:
Nirbhay Choubey
2015-12-19 14:24:38 -05:00
parent 18173ddfc4 90ea014585
commit dad555a09c
3579 changed files with 644330 additions and 222421 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/log.cc
View File

@@ -3424,7 +3424,7 @@ bool MYSQL_BIN_LOG::open(const char *log_name,
it may be good to consider what actually happens when
open_purge_index_file succeeds but register or sync fails.
Perhaps we might need the code below in MYSQL_LOG_BIN::cleanup
Perhaps we might need the code below in MYSQL_BIN_LOG::cleanup
for "real life" purposes as well?
*/
DBUG_EXECUTE_IF("fault_injection_registering_index", {
@@ -7917,11 +7917,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);
}