diff options
| author | unknown <msvensson@shellback.(none)> | 2006-08-16 15:52:52 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-08-16 15:52:52 +0200 |
| commit | 86ac1d9476398a5b3ef1bc20b60382b5a4bb0b1a (patch) | |
| tree | f59d273b42a7a27189d4779c0e6c96ed0b2718ae /mysql-test | |
| parent | f4e98df30c37d0c6e000353c5a3a7e3b80c1d840 (diff) | |
| parent | f5358d906ebe02e2fa1d4483a3d1ff36be2c5130 (diff) | |
| download | mariadb-git-86ac1d9476398a5b3ef1bc20b60382b5a4bb0b1a.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/bug20219/my50-bug20219
into shellback.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'mysql-test')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index c31b35c07d8..afd79e9c887 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1178,28 +1178,33 @@ sub executable_setup () { sub environment_setup () { + 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. + # Setup LD_LIBRARY_PATH so the libraries from this distro/clone + # are used in favor of the system installed ones # -------------------------------------------------------------------------- - - unless ( $opt_source_dist ) + if ( $opt_source_dist ) + { + $extra_ld_library_paths= "$glob_basedir/libmysql/.libs/"; + } + else { - $ENV{'LD_LIBRARY_PATH'}= - "$glob_basedir/lib" . - ($ENV{'LD_LIBRARY_PATH'} ? ":$ENV{'LD_LIBRARY_PATH'}" : ""); - $ENV{'DYLD_LIBRARY_PATH'}= - "$glob_basedir/lib" . - ($ENV{'DYLD_LIBRARY_PATH'} ? ":$ENV{'DYLD_LIBRARY_PATH'}" : ""); + $extra_ld_library_paths= "$glob_basedir/lib"; } # -------------------------------------------------------------------------- # Add the path where mysqld will find udf_example.so # -------------------------------------------------------------------------- + $extra_ld_library_paths .= ":" . + ($lib_udf_example ? dirname($lib_udf_example) : ""); + $ENV{'LD_LIBRARY_PATH'}= - ($lib_udf_example ? dirname($lib_udf_example) : "") . + "$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 |