diff options
| author | unknown <konstantin@mysql.com> | 2005-02-10 16:58:02 +0300 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2005-02-10 16:58:02 +0300 |
| commit | c7674f14248e41dc76ca32feedf7dd76cc1ad7f8 (patch) | |
| tree | e4cdc7197bc74eca4ad26370116105b9d7baa1f3 /mysql-test | |
| parent | 77b2435e4ef22271984551eb6195d64b475ede14 (diff) | |
| parent | fca90750dfa0a2bee85a4824aba7c2197d45587c (diff) | |
| download | mariadb-git-c7674f14248e41dc76ca32feedf7dd76cc1ad7f8.tar.gz | |
manual merge
libmysql/libmysql.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
Diffstat (limited to 'mysql-test')
| -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 368d198e5a9..36cf6d95ba5 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 # |