MySQL Lists are EOL. Please join:

List:Commits« Previous MessageNext Message »
From:kent Date:April 5 2007 6:42am
Subject:bk commit into 5.1 tree (kent:1.2556)
View as plain text  
Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-04-05 08:42:32+02:00, kent@kent-amd64.(none) +9 -0
  Merge mysql.com:/home/kent/bk/sotest/mysql-5.0-build
  into  mysql.com:/home/kent/bk/sotest/mysql-5.1-build
  MERGE: 1.1810.2374.111

  BitKeeper/deleted/.del-SETUP.sh.rej@stripped, 2007-04-05 08:37:32+02:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.1.1.1

  BitKeeper/deleted/.del-configure.in.rej@stripped, 2007-04-05 08:37:32+02:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.1.1.1

  BitKeeper/deleted/.del-my_global.h.rej@stripped, 2007-04-05 08:37:32+02:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.1.1.1

  BitKeeper/deleted/.del-my_pthread.h.rej@stripped, 2007-04-05 08:37:32+02:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.1.1.1

  BitKeeper/deleted/.del-thr_alarm.c.rej@stripped, 2007-04-05 08:37:32+02:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.1.1.1

  config/ac-macros/zlib.m4@stripped, 2007-04-05 08:37:32+02:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.7.1.3

  configure.in@stripped, 2007-04-05 08:37:32+02:00, kent@kent-amd64.(none) +0 -2
    Auto merged
    MERGE: 1.245.1.190

  scripts/make_binary_distribution.sh@stripped, 2007-04-05 08:42:28+02:00, kent@kent-amd64.(none) +0 -0
    SCCS merged
    MERGE: 1.101.1.24

  zlib/Makefile.am@stripped, 2007-04-05 08:37:32+02:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.6.1.9

# 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:	kent
# Host:	kent-amd64.(none)
# Root:	/home/kent/bk/sotest/mysql-5.1-build/RESYNC

--- 1.149/scripts/make_binary_distribution.sh	2007-04-05 08:42:37 +02:00
+++ 1.150/scripts/make_binary_distribution.sh	2007-04-05 08:42:37 +02:00
@@ -117,7 +117,12 @@
  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 @@
 # 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 \

--- 1.11/config/ac-macros/zlib.m4	2007-04-05 08:42:37 +02:00
+++ 1.12/config/ac-macros/zlib.m4	2007-04-05 08:42:37 +02:00
@@ -10,16 +10,25 @@
 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"])

--- 1.16/zlib/Makefile.am	2007-04-05 08:42:37 +02:00
+++ 1.17/zlib/Makefile.am	2007-04-05 08:42:37 +02:00
@@ -21,7 +21,8 @@
 
 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
Thread
bk commit into 5.1 tree (kent:1.2556)kent5 Apr