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-02 12:45:44-07:00, sasha@stripped
  load local fix
  overrun sentry in my_vsnprintf() test
  will not be pushed yet

  BUILD/FINISH.sh
    1.18 02/03/02 12:45:43 sasha@stripped +1 -0
    load local fix

  BUILD/SETUP.sh
    1.16 02/03/02 12:45:43 sasha@stripped +4 -0
    load local fix

  BUILD/compile-pentium-debug-max
    1.8 02/03/02 12:45:43 sasha@stripped +1 -1
    load local fix

  configure.in
    1.185 02/03/02 12:45:43 sasha@stripped +5 -2
    load local fix

  mysys/my_vsnprintf.c
    1.13 02/03/02 12:45:43 sasha@stripped +9 -2
    added overrun sentry to the test

# 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.184/configure.in	Fri Mar  1 19:36:45 2002
+++ 1.185/configure.in	Sat Mar  2 12:45:43 2002
@@ -606,10 +606,13 @@
 AC_ARG_ENABLE(local-infile,
     [  --enable-local-infile
                           If LOAD DATA LOCAL INFILE is enabled by default.],
-    [ ENABLED_LOCAL_INFILE=$enablewal ],
+    [
+      ENABLED_LOCAL_INFILE=$enablewal
+      AC_DEFINE(ENABLED_LOCAL_INFILE)
+    ],
     [ ENABLED_LOCAL_INFILE=no ]
     )
-
+    
 # Use Paul Eggerts macros from GNU tar to check for large file support.
 MYSQL_SYS_LARGEFILE
 

--- 1.12/mysys/my_vsnprintf.c	Fri Mar  1 21:14:12 2002
+++ 1.13/mysys/my_vsnprintf.c	Sat Mar  2 12:45:43 2002
@@ -80,15 +80,22 @@
 }
 
 #ifdef MAIN
+#define OVERRUN_SENTRY  250
 static void my_printf(const char * fmt, ...)
 {
-  char buf[32];
+  char buf[33];
   int n;
   va_list ar;
   va_start(ar, fmt);
-  n = my_vsnprintf(buf, sizeof(buf),fmt, ar);
+  buf[sizeof(buf)-1]=OVERRUN_SENTRY;
+  n = my_vsnprintf(buf, sizeof(buf)-1,fmt, ar);
   printf(buf);
   printf("n=%d, strlen=%d\n", n, strlen(buf));
+  if (buf[sizeof(buf)-1] != OVERRUN_SENTRY)
+  {
+    fprintf(stderr, "Buffer overrun\n");
+    abort();
+  }
   va_end(ar);
 }
 

--- 1.7/BUILD/compile-pentium-debug-max	Thu Feb 14 10:41:32 2002
+++ 1.8/BUILD/compile-pentium-debug-max	Sat Mar  2 12:45:43 2002
@@ -8,6 +8,6 @@
 cxx_warnings="$cxx_warnings $debug_extra_warnings"
 extra_configs="$pentium_configs $debug_configs"
 
-extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl --enable-local-infile"
+extra_configs="$extra_configs --with-berkeley-db --with-innodb --with-embedded-server --with-openssl"
 
 . "$path/FINISH.sh"

--- 1.17/BUILD/FINISH.sh	Mon Feb 11 04:34:11 2002
+++ 1.18/BUILD/FINISH.sh	Sat Mar  2 12:45:43 2002
@@ -1,5 +1,6 @@
 cflags="$c_warnings $extra_flags"
 cxxflags="$cxx_warnings $base_cxxflags $extra_flags"
+extra_configs="$extra_configs $local_infile_configs"
 configure="./configure $base_configs $extra_configs"
 for arg
 do

--- 1.15/BUILD/SETUP.sh	Mon Feb 11 04:34:11 2002
+++ 1.16/BUILD/SETUP.sh	Sat Mar  2 12:45:43 2002
@@ -57,6 +57,10 @@
 alpha_configs=""	# Not used yet
 pentium_configs=""
 sparc_configs=""
+# we need local-infile in all binaries for rpl000001
+# if you need to disable local-infile in the client, write a build script
+# and unset local_infile_configs
+local_infile_configs="--enable-local-infile"
 
 debug_configs="--with-debug"