1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG 54509: automerged bzr bundle from bug report.

Browse Source
This commit is contained in:
Luis Soares 2010-07-08 10:01:12 +01:00
commit 43f6b7b4d5
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sql/rpl_mi.cc
View File

@ -164,7 +164,29 @@ int init_master_info(Master_info* mi, const char* master_info_fname,
*/ */
if (thread_mask & SLAVE_SQL) if (thread_mask & SLAVE_SQL)
{ {
bool hot_log= FALSE;
/*
my_b_seek does an implicit flush_io_cache, so we need to:
1. check if this log is active (hot)
2. if it is we keep log_lock until the seek ends, otherwise
release it right away.
If we did not take log_lock, SQL thread might race with IO
thread for the IO_CACHE mutex.
*/
mysql_mutex_t *log_lock= mi->rli.relay_log.get_log_lock();
mysql_mutex_lock(log_lock);
hot_log= mi->rli.relay_log.is_active(mi->rli.linfo.log_file_name);
if (!hot_log)
mysql_mutex_unlock(log_lock);
my_b_seek(mi->rli.cur_log, (my_off_t) 0); my_b_seek(mi->rli.cur_log, (my_off_t) 0);
if (hot_log)
mysql_mutex_unlock(log_lock);
} }
DBUG_RETURN(0); DBUG_RETURN(0);
} }