summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-02-09 16:36:24 -0800
committerunknown <jimw@mysql.com>2005-02-09 16:36:24 -0800
commit71a1872d66060484f8e52487b640ce43c325f82f (patch)
tree8b6f4a12c5edea9494e965219035af9d58bad8e8 /mysql-test
parentbe8cc0cf6312fd14987fcdf3025082cad9a56d0b (diff)
parent0a869275df33db4270433e454cb2a6e263ed8f0d (diff)
downloadmariadb-git-71a1872d66060484f8e52487b640ce43c325f82f.tar.gz
Merge mysql.com:/home/jimw/my/mysql-4.1-zlib
into mysql.com:/home/jimw/my/mysql-4.1-clean
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/mysql-test-run.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index 39d3f0492c2..af432f37868 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
MASTER_RUNNING=0