MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:ramil Date:February 5 2007 5:56am
Subject:bk commit into 5.1 tree (ramil:1.2379)
View as plain text  
Below is the list of changes that have just been committed into a local
5.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, 2007-02-05 09:56:30+04:00, ramil@stripped +1 -0
  Merge mysql.com:/usr/home/ram/work/bug10798/my50-bug10798
  into  mysql.com:/usr/home/ram/work/bug10798/my51-bug10798
  MERGE: 1.1810.2359.34

  sql/slave.cc@stripped, 2007-02-05 09:56:24+04:00, ramil@stripped +0 -0
    Auto merged
    MERGE: 1.241.1.46

# 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/my51-bug10798/RESYNC

--- 1.300/sql/slave.cc	2007-02-05 09:56:39 +04:00
+++ 1.301/sql/slave.cc	2007-02-05 09:56:39 +04:00
@@ -3318,7 +3318,13 @@ static Log_event* next_event(RELAY_LOG_I
         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 */
Thread
bk commit into 5.1 tree (ramil:1.2379)ramil5 Feb