Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged

client/mysqltest.c

@@ -398,13 +398,13 @@ TYPELIB command_typelib= {array_elements(command_names),"",
 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,

mysql-test/mysql-test-run.pl

@@ -758,16 +758,21 @@ sub command_line_setup () {
     $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
+    if ( ! $glob_win32 )
+    {
+      # Only platforms that have native symlinks can use the vardir trick
       $opt_mem= $opt_vardir;
-    $opt_vardir= $default_vardir;
       mtr_report("Using 4.1 vardir trick");
     }
 
+    $opt_vardir= $default_vardir;
+  }
+
   $path_vardir_trace= $opt_vardir;
   # Chop off any "c:", DBUG likes a unix path ex: c:/src/... => /src/...
   $path_vardir_trace=~ s/^\w://;
@@ -1264,9 +1269,9 @@ sub collect_mysqld_features () {
       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