bk commit into 5.1 tree (msvensson:1.2331)

[msvensson]

Below is the list of changes that have just been committed into a local
5.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-24 16:01:19+02:00, msvensson@neptunus.(none) +2 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
  MERGE: 1.1810.2078.82

  client/mysqltest.c@stripped, 2006-10-24 16:01:15+02:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.155.9.63

  mysql-test/mysql-test-run.pl@stripped, 2006-10-24 16:01:15+02:00, msvensson@neptunus.(none)
+0 -0
    Auto merged
    MERGE: 1.30.1.107

# 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:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-new-maint/RESYNC

--- 1.204/mysql-test/mysql-test-run.pl	2006-10-24 16:01:25 +02:00
+++ 1.205/mysql-test/mysql-test-run.pl	2006-10-24 16:01:25 +02:00
@@ -758,14 +758,19 @@
     $opt_vardir= $default_vardir;
   }
   elsif ( $mysql_version_id < 50000 and
-	  $opt_vardir ne $default_vardir )
+	  $opt_vardir ne $default_vardir)
   {
     # Version 4.1 and --vardir was specified
     # Only supported as a symlink from var/
     # by setting up $opt_mem that symlink will be created
-    $opt_mem= $opt_vardir;
+    if ( ! $glob_win32 )
+    {
+      # Only platforms that have native symlinks can use the vardir trick
+      $opt_mem= $opt_vardir;
+      mtr_report("Using 4.1 vardir trick");
+    }
+
     $opt_vardir= $default_vardir;
-    mtr_report("Using 4.1 vardir trick");
   }
 
   $path_vardir_trace= $opt_vardir;
@@ -1264,9 +1269,9 @@
       else
       {
 	# Put variables into hash
-	if ( $line =~ /^([\S]+)[ \t]+(.*)$/ )
+	if ( $line =~ /^([\S]+)[ \t]+(.*?)\r?$/ )
 	{
-	  # print "$1=$2\n";
+	  # print "$1=\"$2\"\n";
 	  $mysqld_variables{$1}= $2;
 	}
 	else

--- 1.241/client/mysqltest.c	2006-10-24 16:01:25 +02:00
+++ 1.242/client/mysqltest.c	2006-10-24 16:01:25 +02:00
@@ -398,13 +398,13 @@
 DYNAMIC_STRING ds_res, ds_progress, ds_warning_messages;
 
 void die(const char *fmt, ...)
-  /* ATTRIBUTE_FORMAT(printf, 1, 2) */;
+  ATTRIBUTE_FORMAT(printf, 1, 2);
 void abort_not_supported_test(const char *fmt, ...)
-  /* ATTRIBUTE_FORMAT(printf, 1, 2) */;
+  ATTRIBUTE_FORMAT(printf, 1, 2);
 void verbose_msg(const char *fmt, ...)
-  /* ATTRIBUTE_FORMAT(printf, 1, 2) */;
+  ATTRIBUTE_FORMAT(printf, 1, 2);
 void warning_msg(const char *fmt, ...)
-  /* ATTRIBUTE_FORMAT(printf, 1, 2) */;
+  ATTRIBUTE_FORMAT(printf, 1, 2);
 
 VAR* var_from_env(const char *, const char *);
 VAR* var_init(VAR* v, const char *name, int name_len, const char *val,