Commit 9e639bac authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/usr/home/ram/work/bug10798/my51-bug10798


sql/slave.cc:
  Auto merged
parents 6f5dd4b2 aaf1a39b

sql/slave.cc

+7 −1
Original line number Diff line number Diff line
@@ -3321,7 +3321,13 @@ static Log_event* next_event(RELAY_LOG_INFO* rli) 
        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

    {

      /* This is an assertion which sometimes fails, let's try to track it */