database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219

Browse Source 
into  shellback.(none):/home/msvensson/mysql/bug20219/my51-bug20219
This commit is contained in:
msvensson@shellback.(none)
2006-08-16 15:29:58 +02:00
parent 183f028633 ba1ac55acf
commit a163faf0d3
1 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
mysql-test/mysql-test-run.pl
View File

@ -1322,28 +1322,33 @@ sub environment_setup () {
umask(022); umask(022);
# -------------------------------------------------------------------------- my $extra_ld_library_paths;
# We might not use a standard installation directory, like /usr/lib.
# Set LD_LIBRARY_PATH to make sure we find our installed libraries.
# --------------------------------------------------------------------------
unless ( $opt_source_dist ) # --------------------------------------------------------------------------
# Setup LD_LIBRARY_PATH so the libraries from this distro/clone
# are used in favor of the system installed ones
# --------------------------------------------------------------------------
if ( $opt_source_dist )
{ {
$ENV{'LD_LIBRARY_PATH'}= $extra_ld_library_paths= "$glob_basedir/libmysql/.libs/";
"$glob_basedir/lib" . }
($ENV{'LD_LIBRARY_PATH'} ? ":$ENV{'LD_LIBRARY_PATH'}" : ""); else
$ENV{'DYLD_LIBRARY_PATH'}= {
"$glob_basedir/lib" . $extra_ld_library_paths= "$glob_basedir/lib";
($ENV{'DYLD_LIBRARY_PATH'} ? ":$ENV{'DYLD_LIBRARY_PATH'}" : "");
} }
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Add the path where mysqld will find udf_example.so # Add the path where mysqld will find udf_example.so
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
$ENV{'LD_LIBRARY_PATH'}= $extra_ld_library_paths .= ":" .
($lib_udf_example ? dirname($lib_udf_example) : "") . ($lib_udf_example ? dirname($lib_udf_example) : "");
($ENV{'LD_LIBRARY_PATH'} ? ":$ENV{'LD_LIBRARY_PATH'}" : "");
$ENV{'LD_LIBRARY_PATH'}=
"$extra_ld_library_paths" .
($ENV{'LD_LIBRARY_PATH'} ? ":$ENV{'LD_LIBRARY_PATH'}" : "");
$ENV{'DYLD_LIBRARY_PATH'}=
"$extra_ld_library_paths" .
($ENV{'DYLD_LIBRARY_PATH'} ? ":$ENV{'DYLD_LIBRARY_PATH'}" : "");
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Also command lines in .opt files may contain env vars # Also command lines in .opt files may contain env vars