summaryrefslogtreecommitdiff
path: root/mysql-test/mysql-test-run.sh
diff options
context:
space:
mode:
authorunknown <jimw@mysql.com>2005-02-07 15:17:30 -0800
committerunknown <jimw@mysql.com>2005-02-07 15:17:30 -0800
commiteb75a7a5e21186fccaefd7503dc2a07da6c7f989 (patch)
tree6ed05a144b6f3f5e68d72b565aa23f4fba6682e6 /mysql-test/mysql-test-run.sh
parent5be12eba73269ddbcc7e14f1207a8fc1b6d44aaa (diff)
downloadmariadb-git-eb75a7a5e21186fccaefd7503dc2a07da6c7f989.tar.gz
Add the zlib .libs directory to LD_LIBRARY_PATH in mysql-test-run.sh,
which fixes running the tests when using the bundled zlib. mysql-test/mysql-test-run.sh: Add zlib .libs dir to LD_LIBRARY_PATH
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
-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