bk commit into 4.0 tree

[sasha]

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 21:14:13-07:00, sasha@stripped
  post-merge fixup

  BitKeeper/etc/ignore
    1.108 02/03/01 21:14:12 sasha@stripped +1 -0
    Added mysys/test_vsnprintf to the ignore list

  mysql-test/mysql-test-run.sh
    1.146 02/03/01 21:14:12 sasha@stripped +4 -0
    post-merge fix

  mysys/my_vsnprintf.c
    1.12 02/03/01 21:14:12 sasha@stripped +3 -1
    fixed newly introduced 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:	/reiser-data/mysql-4.0

--- 1.145/mysql-test/mysql-test-run.sh	Fri Mar  1 19:36:45 2002
+++ 1.146/mysql-test/mysql-test-run.sh	Fri Mar  1 21:14:12 2002
@@ -161,6 +161,10 @@
 MASTER_MYPORT=9306
 SLAVE_RUNNING=0
 SLAVE_MYPORT=9307
+MYSQL_MANAGER_PORT=9305 # needs to be out of the way of slaves
+MYSQL_MANAGER_PW_FILE=$MYSQL_TEST_DIR/var/tmp/manager.pwd
+MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log
+MYSQL_MANAGER_USER=root
 NO_SLAVE=0
 USER_TEST=
 

--- 1.11/mysys/my_vsnprintf.c	Fri Mar  1 17:12:14 2002
+++ 1.12/mysys/my_vsnprintf.c	Fri Mar  1 21:14:12 2002
@@ -19,6 +19,7 @@
 #include <m_string.h>
 #include <stdarg.h>
 #include <m_ctype.h>
+#include <assert.h>
 
 int my_snprintf(char* to, size_t n, const char* fmt, ...)
 {
@@ -53,7 +54,7 @@
       plen = (uint) strlen(par);
       if (left_len <= plen)
 	plen = left_len - 1;
-      to=strmov(to,par);
+      to=strnmov(to,par,plen);
       continue;
     }
     else if (*fmt == 'd' || *fmt == 'u')	/* Integer parameter */
@@ -73,6 +74,7 @@
       break;
     *to++='%';				/* % used as % or unknown code */
   }
+  DBUG_ASSERT(to <= end);
   *to='\0';				/* End of errmessage */
   return (uint) (to - start);
 }

--- 1.107/BitKeeper/etc/ignore	Fri Feb 15 16:13:47 2002
+++ 1.108/BitKeeper/etc/ignore	Fri Mar  1 21:14:12 2002
@@ -461,3 +461,4 @@
 Docs/mysql.xml
 mysql-test/r/rpl000001.eval
 Docs/safe-mysql.xml
+mysys/test_vsnprintf