Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1-maint

into  mysql.com:/usr/home/ram/work/bug10798/my41-bug10798
parents 2c45e72e 24f47398
...@@ -4283,6 +4283,13 @@ Log_event* next_event(RELAY_LOG_INFO* rli) ...@@ -4283,6 +4283,13 @@ Log_event* next_event(RELAY_LOG_INFO* rli)
hot_log=0; // Using old binary log hot_log=0; // Using old binary log
} }
} }
/*
As there is no guarantee that the relay is open (for example, an I/O
error during a write by the slave I/O thread may have closed it), we
have to test it.
*/
if (!my_b_inited(cur_log))
goto err;
#ifndef DBUG_OFF #ifndef DBUG_OFF
{ {
char llbuf1[22], llbuf2[22]; char llbuf1[22], llbuf2[22];
......
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