Merge mysql.com:/home/kent/bk/sotest/mysql-5.0-build

into  mysql.com:/home/kent/bk/sotest/mysql-5.1-build


BitKeeper/deleted/.del-SETUP.sh.rej:
  Auto merged
BitKeeper/deleted/.del-configure.in.rej:
  Auto merged
BitKeeper/deleted/.del-my_global.h.rej:
  Auto merged
BitKeeper/deleted/.del-my_pthread.h.rej:
  Auto merged
BitKeeper/deleted/.del-thr_alarm.c.rej:
  Auto merged
config/ac-macros/zlib.m4:
  Auto merged
configure.in:
  Auto merged
zlib/Makefile.am:
  Auto merged
scripts/make_binary_distribution.sh:
  SCCS merged

config/ac-macros/zlib.m4

@@ -10,16 +10,25 @@ AC_SUBST([zlib_dir])
 mysql_cv_compress="yes"
 ])
 
-dnl Auxiliary macro to check for zlib at given path
+dnl Auxiliary macro to check for zlib at given path.
+dnl We are strict with the server, as "archive" engine
+dnl needs zlibCompileFlags(), but for client only we
+dnl are less strict, and take the zlib we find.
 
 AC_DEFUN([MYSQL_CHECK_ZLIB_DIR], [
 save_CPPFLAGS="$CPPFLAGS"
 save_LIBS="$LIBS"
 CPPFLAGS="$ZLIB_INCLUDES $CPPFLAGS"
 LIBS="$LIBS $ZLIB_LIBS"
+if test X"$with_server" = Xno
+then
+  zlibsym=zlibVersion
+else
+  zlibsym=zlibCompileFlags
+fi
 AC_CACHE_VAL([mysql_cv_compress],
   [AC_TRY_LINK([#include <zlib.h>],
-    [return zlibCompileFlags();],
+    [return $zlibsym();],
     [mysql_cv_compress="yes"
     AC_MSG_RESULT([ok])],
     [mysql_cv_compress="no"])

scripts/make_binary_distribution.sh

@@ -117,7 +117,12 @@ if [ $BASE_SYSTEM != "netware" ] ; then
  chmod o-rwx $BASE/data $BASE/data/*
 fi
 
-# Copy files if they exists, warn for those that don't
+# Copy files if they exists, warn for those that don't.
+# Note that when listing files to copy, we might list the file name
+# twice, once in the directory location where it is build, and a
+# second time in the ".libs" location. In the case the firs one
+# is a wrapper script, the second one will overwrite it with the
+# binary file.
 copyfileto()
 {
   destdir=$1
@@ -168,6 +173,7 @@ if [ $BASE_SYSTEM = "netware" ] ; then
 # For all other platforms:
 else
   BIN_FILES="$BIN_FILES \
+    server-tools/instance-manager/.libs/mysqlmanager \
     client/.libs/mysql client/.libs/mysqlshow client/.libs/mysqladmin \
     client/.libs/mysqlslap \
     client/.libs/mysqldump client/.libs/mysqlimport \

zlib/Makefile.am

@@ -21,7 +21,8 @@ LIBS= $(NON_THREADED_LIBS)
 
 pkglib_LTLIBRARIES=libz.la
 
-libz_la_LDFLAGS= -version-info 3:3:2
+# We are never interested in a shared version
+libz_la_LDFLAGS= -static
 
 noinst_HEADERS= crc32.h deflate.h inffast.h inffixed.h inflate.h \
 		inftrees.h trees.h zconf.h zlib.h zutil.h