mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-14 19:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

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

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


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
This commit is contained in:
unknown 2006-10-24 16:00:42 +02:00
commit c9ef0344f8
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
mysql-test/mysql-test-run.pl
View file

@ -758,14 +758,19 @@ 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
$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 @@ 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