List:Internals« Previous MessageNext Message »
From:sasha Date:April 19 2002 12:41am
Subject:bk commit into 4.0 tree
View as plain text  
Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2002-04-18 18:41:45-06:00, sasha@stripped
  fixed assertion failure on corrupted log in reckless slave mode

  sql/slave.cc
    1.166 02/04/18 18:41:43 sasha@stripped +2 -0
    fixed assertion failure on corrupted log in reckless slave mode

# 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:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql-4.0

--- 1.165/sql/slave.cc	Mon Apr 15 17:09:29 2002
+++ 1.166/sql/slave.cc	Thu Apr 18 18:41:43 2002
@@ -1115,6 +1115,7 @@
 static bool wait_for_relay_log_space(RELAY_LOG_INFO* rli)
 {
   bool slave_killed;
+  LINT_INIT(slave_killed);
   MASTER_INFO* mi = rli->mi;
   const char* save_proc_info;
   THD* thd = mi->io_thd;
@@ -2579,6 +2580,7 @@
 	    goto err;
 	  }
 	  rli->relay_log_pos = 4;
+	  rli->pending=0;
 	  strnmov(rli->relay_log_name,rli->linfo.log_file_name,
 		  sizeof(rli->relay_log_name));
 	  flush_relay_log_info(rli);
Thread
bk commit into 4.0 treesasha19 Apr