diff options
| author | unknown <joerg@trift2.> | 2007-06-06 12:02:07 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-06-06 12:02:07 +0200 |
| commit | 7ffa8c91cc91ee0a2c894b88376c9fc19a3fcc9b (patch) | |
| tree | 127ac3599e1459779ec7052efe2acf838568f522 /mysql-test/mysql-test-run.pl | |
| parent | da49952b7eb6cb5e9d39630b202e4dbf42ba91dc (diff) | |
| parent | e409a8a5c0402859ec0754e5d060e3ae06df4c6e (diff) | |
| download | mariadb-git-7ffa8c91cc91ee0a2c894b88376c9fc19a3fcc9b.tar.gz | |
Merge trift2.:/MySQL/M50/mysql-5.0
into trift2.:/MySQL/M50/push-5.0
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 339bedcd32c..c36a95cc802 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1784,6 +1784,17 @@ sub environment_setup () { split(':', $ENV{'DYLD_LIBRARY_PATH'}) : ()); mtr_debug("DYLD_LIBRARY_PATH: $ENV{'DYLD_LIBRARY_PATH'}"); + # The environment variable used for shared libs on AIX + $ENV{'SHLIB_PATH'}= join(":", @ld_library_paths, + $ENV{'SHLIB_PATH'} ? + split(':', $ENV{'SHLIB_PATH'}) : ()); + mtr_debug("SHLIB_PATH: $ENV{'SHLIB_PATH'}"); + + # The environment variable used for shared libs on hp-ux + $ENV{'LIBPATH'}= join(":", @ld_library_paths, + $ENV{'LIBPATH'} ? + split(':', $ENV{'LIBPATH'}) : ()); + mtr_debug("LIBPATH: $ENV{'LIBPATH'}"); # -------------------------------------------------------------------------- # Also command lines in .opt files may contain env vars |