List:Internals« Previous MessageNext Message »
From:sasha Date:October 17 2001 8:12pm
Subject:bk commit into 3.23 tree
View as plain text  
Below is the list of changes that have just been commited into a local
3.23. repository of sasha. When sasha does a push, they will be
propogaged to the main repository and within 24 hours after the push into
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, 2001-10-17 14:12:14-06:00, sasha@stripped
  fixed sleep 
  bug on reconnect

  sql/slave.cc
    1.116 01/10/17 14:12:13 sasha@stripped +3 -2
    fixed sleep bug

# 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:	/home/sasha/src/bk/mysql

--- 1.115/sql/slave.cc	Fri Oct  5 13:18:14 2001
+++ 1.116/sql/slave.cc	Wed Oct 17 14:12:13 2001
@@ -1481,9 +1481,10 @@
 %s, last_errno=%d, retry in %d sec",
 		      mc_mysql_error(mysql), last_errno=mc_mysql_errno(mysql),
 		      mi->connect_retry);
-      safe_sleep(thd, mi->connect_retry);
     }
-    if (err_count++ == master_retry_count)
+    safe_sleep(thd, mi->connect_retry);
+    /* if master_retry_count is not set, keep trying until success */
+    if (master_retry_count && err_count++ == master_retry_count)
     {
       slave_was_killed=1;
       break;
Thread
bk commit into 3.23 treesasha17 Oct