bk commit into 5.1 tree (tsmith:1.2359)

[tim]

Below is the list of changes that have just been committed into a local
5.1 repository of tim. When tim 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 00:03:21-06:00, tsmith@stripped +2 -0
  Fix some bad code in mysqltest.c and mysql-test-run.pl which could cause segfault / wrong LD_LIBRARY_PATH settings.

  client/mysqltest.c@stripped, 2006-10-11 00:03:18-06:00, tsmith@stripped +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.

  mysql-test/mysql-test-run.pl@stripped, 2006-10-11 00:03:18-06:00, tsmith@stripped +2 -2
    Remove bogus quoting of $ENV{LD_LIBRARY_PATH} and $ENV{DYLD_LIBRARY_PATH} in environment_setup().

# 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:	tsmith
# Host:	siva.hindu.god
# Root:	/usr/home/tim/m/bk/mtest-foo/51

--- 1.190/mysql-test/mysql-test-run.pl	2006-10-11 00:03:33 -06:00
+++ 1.191/mysql-test/mysql-test-run.pl	2006-10-11 00:03:33 -06:00
@@ -1505,11 +1505,11 @@ sub environment_setup () {
   }
 
   $ENV{'LD_LIBRARY_PATH'}= join(":", @ld_library_paths,
-				split(':', qw($ENV{'LD_LIBRARY_PATH'})));
+				split(':', $ENV{'LD_LIBRARY_PATH'}));
   mtr_debug("LD_LIBRARY_PATH: $ENV{'LD_LIBRARY_PATH'}");
 
   $ENV{'DYLD_LIBRARY_PATH'}= join(":", @ld_library_paths,
-				split(':', qw($ENV{'DYLD_LIBRARY_PATH'})));
+				split(':', $ENV{'DYLD_LIBRARY_PATH'}));
   mtr_debug("DYLD_LIBRARY_PATH: $ENV{'DYLD_LIBRARY_PATH'}");
 
 

--- 1.233/client/mysqltest.c	2006-10-11 00:03:33 -06:00
+++ 1.234/client/mysqltest.c	2006-10-11 00:03:33 -06:00
@@ -727,13 +727,6 @@ void die(const char *fmt, ...)
   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\": ",