diff options
| author | unknown <joreland@mysql.com> | 2005-02-10 17:12:53 +0100 |
|---|---|---|
| committer | unknown <joreland@mysql.com> | 2005-02-10 17:12:53 +0100 |
| commit | d8c74a9cd2d9e22e1b08fb6309cb21f84f68647f (patch) | |
| tree | f9a0ffccf4586b980180dd2ad46ffb0a0872b6ea /mysql-test/mysql-test-run.sh | |
| parent | ed74e8f9a634fc1aab1e957490de9e46cc5ebd4a (diff) | |
| parent | 62fc28f46da210ee77c94df7b81f795363b377a9 (diff) | |
| download | mariadb-git-d8c74a9cd2d9e22e1b08fb6309cb21f84f68647f.tar.gz | |
Merge mysql.com:/home/jonas/src/mysql-5.0
into mysql.com:/home/jonas/src/mysql-5.0-ndb
mysql-test/mysql-test-run.sh:
Auto merged
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index e3f6f1eb69e..6eb769c9300 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -194,8 +194,8 @@ MY_LOG_DIR="$MYSQL_TEST_DIR/var/log" # # Set LD_LIBRARY_PATH if we are using shared libraries # -LD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$LD_LIBRARY_PATH" -DYLD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$DYLD_LIBRARY_PATH" +LD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/zlib/.libs:$LD_LIBRARY_PATH" +DYLD_LIBRARY_PATH="$BASEDIR/lib:$BASEDIR/libmysql/.libs:$BASEDIR/zlib/.libs:$DYLD_LIBRARY_PATH" export LD_LIBRARY_PATH DYLD_LIBRARY_PATH # |