bk commit into 4.1 tree (ramil:1.2598) BUG#10798

[ramil]

Below is the list of changes that have just been committed into a local
4.1 repository of ram. When ram does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-18 15:50:21+04:00, ramil@stripped +1 -0
  Fix for bug #10798: If relay log fails to rotate, slave will crash after
  
  The relay log may not be open for some reason (e.g. disk error) after rotation,
  and using it causes the slave crash.
  
  Fix: check we have it open before access, return error otherwise.

  sql/slave.cc@stripped, 2006-12-18 15:50:17+04:00, ramil@stripped +6 -0
    Fix for bug #10798: If relay log fails to rotate, slave will crash after
      - check if the relay log is open before any access.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	ramil
# Host:	myoffice.izhnet.ru
# Root:	/usr/home/ram/work/bug10798/my41-bug10798

--- 1.284/sql/slave.cc	2006-12-18 15:50:27 +04:00
+++ 1.285/sql/slave.cc	2006-12-18 15:50:27 +04:00
@@ -4284,6 +4284,12 @@ Log_event* next_event(RELAY_LOG_INFO* rl
 	hot_log=0;				// Using old binary log
       }
     }
+    /* 
+      As there is no guarantee the relay log is open (for example, 
+      due to IO error) we have to test it.
+    */
+    if (!my_b_inited(cur_log))
+      goto err;
 #ifndef DBUG_OFF
     {
       char llbuf1[22], llbuf2[22];