bk commit into 4.1 tree (jimw:1.2179)

[jimw]

Below is the list of changes that have just been committed into a local
4.1 repository of jimw. When jimw does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2179 05/02/07 15:17:30 jimw@stripped +1 -0
  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
    1.241 05/02/07 15:14:38 jimw@stripped +2 -2
    Add zlib .libs dir to LD_LIBRARY_PATH

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jimw
# Host:	rama.(none)
# Root:	/home/jimw/my/mysql-4.1-zlib

--- 1.240/mysql-test/mysql-test-run.sh	2005-02-07 08:58:57 -08:00
+++ 1.241/mysql-test/mysql-test-run.sh	2005-02-07 15:14:38 -08:00
@@ -194,8 +194,8 @@
 #
 # 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