List:Internals« Previous MessageNext Message »
From:sasha Date:March 9 2002 8:50pm
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-03-09 13:50:07-07:00, sasha@stripped
  fixed replication bug
  not yet tested - will not be pushed for a few hours - need to commit in 
  order to pull

  BUILD/compile-pentium-debug
    1.28 02/03/09 13:50:06 sasha@stripped +1 -1
    link statically

  sql/slave.cc
    1.160 02/03/09 13:50:06 sasha@stripped +2 -0
    properly seek the position when recovering from a partial read

# 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.27/BUILD/compile-pentium-debug	Thu Apr  5 19:04:33 2001
+++ 1.28/BUILD/compile-pentium-debug	Sat Mar  9 13:50:06 2002
@@ -6,7 +6,7 @@
 extra_flags="$pentium_cflags $debug_cflags"
 c_warnings="$c_warnings $debug_extra_warnings"
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
-extra_configs="$pentium_configs $debug_configs"
+extra_configs="$pentium_configs $debug_configs $static_link"
 
 extra_configs="$extra_configs "
 

--- 1.159/sql/slave.cc	Fri Mar  8 15:02:11 2002
+++ 1.160/sql/slave.cc	Sat Mar  9 13:50:06 2002
@@ -2470,6 +2470,8 @@
       sql_print_error("Slave SQL thread: I/O error reading \
 event(errno=%d,cur_log->error=%d)",
 		      my_errno,cur_log->error);
+      // set read position to the beginning of the event
+      my_b_seek(cur_log,rli->relay_log_pos+rli->pending);
       // no need to hog the mutex while we sleep
       pthread_mutex_unlock(&rli->data_lock);
       safe_sleep(rli->sql_thd,1,(CHECK_KILLED_FUNC)sql_slave_killed,
Thread
bk commit into 4.0 treesasha9 Mar