List:Internals« Previous MessageNext Message »
From:sasha Date:March 2 2002 12:12am
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-01 17:12:15-07:00, sasha@stripped
  make my_vsnprintf() work with oversized strings
  fixed replication bug - flush_master_info() needs to be called every time we read an 
      event from master
  
  this is will not be pushed yet

  mysys/my_vsnprintf.c
    1.11 02/03/01 17:12:14 sasha@stripped +6 -7
    make my_vsnprintf() work with oversized strings
    corrected Swedish "skipp" in the comments

  sql/log.cc
    1.77 02/03/01 17:12:14 sasha@stripped +2 -1
    wrong change - to be undone

  sql/slave.cc
    1.156 02/03/01 17:12:14 sasha@stripped +1 -0
    fixed bug - flush_master_info() needs to be called every time we read an 
    event from master

# 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.10/mysys/my_vsnprintf.c	Thu Dec  6 05:10:43 2001
+++ 1.11/mysys/my_vsnprintf.c	Fri Mar  1 17:12:14 2002
@@ -39,7 +39,7 @@
       *to++= *fmt;			/* Copy ordinary char */
       continue;
     }
-    /* Skipp if max size is used (to be compatible with printf) */
+    /* Skip if max size is used (to be compatible with printf) */
     fmt++;
     while (isdigit(*fmt) || *fmt == '.' || *fmt == '-')
       fmt++;
@@ -48,14 +48,13 @@
     if (*fmt == 's')				/* String parameter */
     {
       reg2 char	*par = va_arg(ap, char *);
-      uint plen;
+      uint plen,left_len = (uint)(end-to);
       if (!par) par = (char*)"(null)";
       plen = (uint) strlen(par);
-      if ((uint) (end-to) > plen)	/* Replace if possible */
-      {
-	to=strmov(to,par);
-	continue;
-      }
+      if (left_len <= plen)
+	plen = left_len - 1;
+      to=strmov(to,par);
+      continue;
     }
     else if (*fmt == 'd' || *fmt == 'u')	/* Integer parameter */
     {

--- 1.76/sql/log.cc	Wed Jan 30 07:37:47 2002
+++ 1.77/sql/log.cc	Fri Mar  1 17:12:14 2002
@@ -237,7 +237,8 @@
     /*
       Explanation of the boolean black magic:
       if we are supposed to write magic number try write
-      clean up if failed
+      clean 
+up if failed
       then if index_file has not been previously opened, try to open it
       clean up if failed
     */

--- 1.155/sql/slave.cc	Mon Feb 11 04:48:58 2002
+++ 1.156/sql/slave.cc	Fri Mar  1 17:12:14 2002
@@ -1762,6 +1762,7 @@
 from master");
 	goto err;
       }
+      flush_master_info(mi);
       // TODO: check debugging abort code
 #ifndef DBUG_OFF
       if (abort_slave_event_count && !--events_till_abort)
Thread
bk commit into 4.0 treesasha2 Mar