Commit cb1cdc5a authored by unknown's avatar unknown

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
parents 7dbf6849 b3bba481
...@@ -398,13 +398,13 @@ TYPELIB command_typelib= {array_elements(command_names),"", ...@@ -398,13 +398,13 @@ TYPELIB command_typelib= {array_elements(command_names),"",
DYNAMIC_STRING ds_res, ds_progress, ds_warning_messages; DYNAMIC_STRING ds_res, ds_progress, ds_warning_messages;
void die(const char *fmt, ...) void die(const char *fmt, ...)
/* ATTRIBUTE_FORMAT(printf, 1, 2) */; ATTRIBUTE_FORMAT(printf, 1, 2);
void abort_not_supported_test(const char *fmt, ...) void abort_not_supported_test(const char *fmt, ...)
/* ATTRIBUTE_FORMAT(printf, 1, 2) */; ATTRIBUTE_FORMAT(printf, 1, 2);
void verbose_msg(const char *fmt, ...) void verbose_msg(const char *fmt, ...)
/* ATTRIBUTE_FORMAT(printf, 1, 2) */; ATTRIBUTE_FORMAT(printf, 1, 2);
void warning_msg(const char *fmt, ...) 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_from_env(const char *, const char *);
VAR* var_init(VAR* v, const char *name, int name_len, const char *val, VAR* var_init(VAR* v, const char *name, int name_len, const char *val,
......
...@@ -758,14 +758,19 @@ sub command_line_setup () { ...@@ -758,14 +758,19 @@ sub command_line_setup () {
$opt_vardir= $default_vardir; $opt_vardir= $default_vardir;
} }
elsif ( $mysql_version_id < 50000 and elsif ( $mysql_version_id < 50000 and
$opt_vardir ne $default_vardir ) $opt_vardir ne $default_vardir)
{ {
# Version 4.1 and --vardir was specified # Version 4.1 and --vardir was specified
# Only supported as a symlink from var/ # Only supported as a symlink from var/
# by setting up $opt_mem that symlink will be created # 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; $opt_vardir= $default_vardir;
mtr_report("Using 4.1 vardir trick");
} }
$path_vardir_trace= $opt_vardir; $path_vardir_trace= $opt_vardir;
...@@ -1264,9 +1269,9 @@ sub collect_mysqld_features () { ...@@ -1264,9 +1269,9 @@ sub collect_mysqld_features () {
else else
{ {
# Put variables into hash # 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; $mysqld_variables{$1}= $2;
} }
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment