mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0

Browse source 
into  mysql.com:/Users/kent/mysql/bk/mysql-5.1


mysql-test/mysql-test-run.pl:
  Auto merged
This commit is contained in:
unknown 2006-11-11 14:46:06 +01:00
commit 47bdda0b9d
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -643,7 +643,7 @@ sub command_line_setup () {
$glob_hostname= mtr_short_hostname(); $glob_hostname= mtr_short_hostname();
# 'basedir' is always above "mysql-test" directory ... # Find the absolute path to the test directory
$glob_mysql_test_dir= cwd(); $glob_mysql_test_dir= cwd();
if ( $glob_cygwin_perl ) if ( $glob_cygwin_perl )
{ {
@ -651,12 +651,20 @@ sub command_line_setup () {
$glob_mysql_test_dir= `cygpath -m "$glob_mysql_test_dir"`; $glob_mysql_test_dir= `cygpath -m "$glob_mysql_test_dir"`;
chomp($glob_mysql_test_dir); chomp($glob_mysql_test_dir);
} }
# ... direct parent for "tar.gz" installations, ...
$glob_basedir= dirname($glob_mysql_test_dir); # In most cases, the base directory we find everything relative to,
# ... or one more level up, for RPM installations. # is the parent directory of the "mysql-test" directory. For source
if ( ! -d "$glob_basedir/bin" ) # distributions, TAR binary distributions and some other packages.
$glob_basedir= dirname($glob_mysql_test_dir);
# In the RPM case, binaries and libraries are installed in the
# default system locations, instead of having our own private base
# directory. And we install "/usr/share/mysql-test". Moving up one
# more directory relative to "mysql-test" gives us a usable base
# directory for RPM installs.
if ( ! $opt_source_dist and ! -d "$glob_basedir/bin" )
{ {
$glob_basedir= dirname($glob_basedir); $glob_basedir= dirname($glob_basedir);
} }
# Expect mysql-bench to be located adjacent to the source tree, by default # Expect mysql-bench to be located adjacent to the source tree, by default