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

1 files changed, 7 insertions, 1 deletions

diff --git a/sql/slave.cc b/sql/slave.cc
index 0be829337e7..4c471df71f8 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -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 */