From: kent
Date: March 12 2007 12:29pm
Subject: bk commit into 5.1 tree (kent:1.2482)
List-Archive: http://lists.mysql.com/commits/21721
Message-Id: <20070312122916.78C66CB810A@kent-amd64.localdomain>
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-03-12 13:29:11+01:00, kent@kent-amd64.(none) +6 -0
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
MERGE: 1.1810.2373.150
BitKeeper/deleted/.del-mysys.dsp~32695fee91189326@stripped, 2007-03-12 13:28:40+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.30.2.2
BitKeeper/deleted/.del-mysys.dsp~32695fee91189326@stripped, 2007-03-12 13:28:40+01:00, kent@kent-amd64.(none) +0 -0
Merge rename: VC++Files/mysys/mysys.dsp -> BitKeeper/deleted/.del-mysys.dsp~32695fee91189326
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822@stripped, 2007-03-12 13:28:40+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.2.4.2
BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822@stripped, 2007-03-12 13:28:40+01:00, kent@kent-amd64.(none) +0 -0
Merge rename: VC++Files/mysys/mysys.vcproj -> BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822
BitKeeper/deleted/.del-mysys_ia64.dsp~7a98bd8cd01d3043@stripped, 2007-03-12 13:28:40+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.4.1.2
BitKeeper/deleted/.del-mysys_ia64.dsp~7a98bd8cd01d3043@stripped, 2007-03-12 13:28:40+01:00, kent@kent-amd64.(none) +0 -0
Merge rename: VC++Files/mysys/mysys_ia64.dsp -> BitKeeper/deleted/.del-mysys_ia64.dsp~7a98bd8cd01d3043
configure.in@stripped, 2007-03-12 13:28:40+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.245.1.185
include/Makefile.am@stripped, 2007-03-12 13:29:07+01:00, kent@kent-amd64.(none) +1 -2
MERGE: 1.52.2.13
mysys/Makefile.am@stripped, 2007-03-12 13:28:40+01:00, kent@kent-amd64.(none) +0 -0
Auto merged
MERGE: 1.62.1.13
# 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/tmp/mysql-5.1-build/RESYNC
--- 1.442/configure.in 2007-03-12 13:29:16 +01:00
+++ 1.443/configure.in 2007-03-12 13:29:16 +01:00
@@ -739,10 +739,6 @@
# Check if crypt() exists in libc or libcrypt, sets LIBS if needed
AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
-# For sem_xxx functions on Solaris 2.6
-AC_CHECK_FUNC(sem_init, , AC_CHECK_LIB(posix4, sem_init))
-MYSQL_CHECK_ZLIB_WITH_COMPRESS
-
# For large pages support
if test "$TARGET_LINUX" = "true"
then
--- 1.77/include/Makefile.am 2007-03-12 13:29:16 +01:00
+++ 1.78/include/Makefile.am 2007-03-12 13:29:16 +01:00
@@ -22,7 +22,7 @@
my_list.h my_alloc.h typelib.h
pkginclude_HEADERS = $(HEADERS_ABI) my_dbug.h m_string.h my_sys.h \
my_xml.h mysql_embed.h \
- my_semaphore.h my_pthread.h my_no_pthread.h \
+ my_pthread.h my_no_pthread.h \
errmsg.h my_global.h my_net.h \
my_getopt.h sslopt-longopts.h my_dir.h \
sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
--- 1.88/mysys/Makefile.am 2007-03-12 13:29:16 +01:00
+++ 1.89/mysys/Makefile.am 2007-03-12 13:29:16 +01:00
@@ -47,7 +47,7 @@
my_sync.c my_getopt.c my_mkdir.c \
default_modify.c default.c \
my_compress.c checksum.c \
- my_net.c my_semaphore.c my_port.c my_sleep.c \
+ my_net.c my_port.c my_sleep.c \
charset.c charset-def.c my_bitmap.c my_bit.c md5.c \
my_gethostbyname.c rijndael.c my_aes.c sha1.c \
my_handler.c my_netware.c my_largepage.c \
--- 1.2.4.1/VC++Files/mysys/mysys.vcproj 2007-03-12 13:29:16 +01:00
+++ 1.12/BitKeeper/deleted/.del-mysys.vcproj~40a49d09c4184822 2007-03-12 13:29:16 +01:00
@@ -405,6 +405,50 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4410,10 +4454,7 @@
-
-
+ RelativePath="my_vle.c">
+ RelativePath="mysys_priv.h">
+
+
+ RelativePath="queues.c">