Commit ff924d23 authored by unknown's avatar unknown

fixed assertion failure on corrupted log in reckless slave mode

parent de0a21cf
...@@ -1115,6 +1115,7 @@ static inline int add_relay_log(RELAY_LOG_INFO* rli,LOG_INFO* linfo) ...@@ -1115,6 +1115,7 @@ static inline int add_relay_log(RELAY_LOG_INFO* rli,LOG_INFO* linfo)
static bool wait_for_relay_log_space(RELAY_LOG_INFO* rli) static bool wait_for_relay_log_space(RELAY_LOG_INFO* rli)
{ {
bool slave_killed; bool slave_killed;
LINT_INIT(slave_killed);
MASTER_INFO* mi = rli->mi; MASTER_INFO* mi = rli->mi;
const char* save_proc_info; const char* save_proc_info;
THD* thd = mi->io_thd; THD* thd = mi->io_thd;
...@@ -2579,6 +2580,7 @@ Log_event* next_event(RELAY_LOG_INFO* rli) ...@@ -2579,6 +2580,7 @@ Log_event* next_event(RELAY_LOG_INFO* rli)
goto err; goto err;
} }
rli->relay_log_pos = 4; rli->relay_log_pos = 4;
rli->pending=0;
strnmov(rli->relay_log_name,rli->linfo.log_file_name, strnmov(rli->relay_log_name,rli->linfo.log_file_name,
sizeof(rli->relay_log_name)); sizeof(rli->relay_log_name));
flush_relay_log_info(rli); flush_relay_log_info(rli);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment