Commit f27ea1b1 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/home/ram/work/bug10798/my41-bug10798

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


sql/slave.cc:
  merging
parents 607af5c6 045158fc
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -4838,7 +4838,13 @@ 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 */