bk commit into 4.1 tree (msvensson:1.2576)

[msvensson]

Below is the list of changes that have just been committed into a local
4.1 repository of msvensson. When msvensson does a push these changes will
be propagated 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-10-11 11:21:44+02:00, msvensson@shellback.(none) +1 -0
  Fix some bad code in mysqltest.c which cause segfault

  client/mysqltest.c@stripped, 2006-10-11 11:19:51+02:00, msvensson@shellback.(none) +0 -7
    Remove vsnprintf() and DBUG_PRINT from die() function, as it's not portable to Windows, and it's not allowed to
    call vsnprintf() and then vfprintf() with the same args.
    Can't just print the buffer here, because the buffer is a fixed size.
    If the message is longer than will fit int he buffer, it would get
    truncated on Unix, and the full thing would be printed on Windows.
    This DBUG_PRINT isn't important enough for this hassle, so just get rid
    of it.
    

# 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:	msvensson
# Host:	shellback.(none)
# Root:	/home/msvensson/mysql/mysql-4.1-maint

--- 1.209/client/mysqltest.c	2006-10-11 11:21:50 +02:00
+++ 1.210/client/mysqltest.c	2006-10-11 11:21:50 +02:00
@@ -727,13 +727,6 @@
   va_start(args, fmt);
   if (fmt)
   {
-#ifdef DBUG_ON
-#ifndef __WIN__
-    char buff[256];
-    vsnprintf(buff, sizeof(buff), fmt, args);
-    DBUG_PRINT("error", ("%s", buff));
-#endif
-#endif
     fprintf(stderr, "mysqltest: ");
     if (cur_file && cur_file != file_stack)
       fprintf(stderr, "In included file \"%s\": ",