Below is the list of changes that have just been committed into a local
5.0 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:22:02+01:00, kent@stripped +7 -0
Merge mysql.com:/home/kent/bk/tmp/mysql-4.1-build
into mysql.com:/home/kent/bk/tmp/mysql-5.0-build
MERGE: 1.1616.2877.61
BitKeeper/deleted/.del-my_semaphore.c@stripped, 2007-03-12 13:20:31+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.3.1.1
BitKeeper/deleted/.del-my_semaphore.c@stripped, 2007-03-12 13:20:31+01:00, kent@stripped +0 -0
Merge rename: mysys/my_semaphore.c -> BitKeeper/deleted/.del-my_semaphore.c
VC++Files/mysys/mysys.dsp@stripped, 2007-03-12 13:21:37+01:00, kent@stripped +0 -0
SCCS merged
MERGE: 1.23.1.4
VC++Files/mysys/mysys.vcproj@stripped, 2007-03-12 13:20:31+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.1.1.2
VC++Files/mysys/mysys_ia64.dsp@stripped, 2007-03-12 13:20:31+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.2.1.2
configure.in@stripped, 2007-03-12 13:21:07+01:00, kent@stripped +16 -0
MERGE: 1.201.64.25
include/Makefile.am@stripped, 2007-03-12 13:21:59+01:00, kent@stripped +1 -2
MERGE: 1.48.1.5
mysys/Makefile.am@stripped, 2007-03-12 13:20:31+01:00, kent@stripped +0 -0
Auto merged
MERGE: 1.54.1.4
# 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.0-build/RESYNC
--- 1.429/configure.in 2007-03-12 13:22:07 +01:00
+++ 1.430/configure.in 2007-03-12 13:22:07 +01:00
@@ -778,10 +778,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.66/include/Makefile.am 2007-03-12 13:22:07 +01:00
+++ 1.67/include/Makefile.am 2007-03-12 13:22:07 +01:00
@@ -21,7 +21,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 raid.h \
+ my_pthread.h my_no_pthread.h raid.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.74/mysys/Makefile.am 2007-03-12 13:22:07 +01:00
+++ 1.75/mysys/Makefile.am 2007-03-12 13:22:07 +01:00
@@ -50,7 +50,7 @@
my_sync.c my_getopt.c my_mkdir.c \
default_modify.c default.c \
my_compress.c checksum.c raid.cc \
- 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.4/VC++Files/mysys/mysys_ia64.dsp 2007-03-12 13:22:07 +01:00
+++ 1.5/VC++Files/mysys/mysys_ia64.dsp 2007-03-12 13:22:07 +01:00
@@ -538,10 +538,6 @@
# End Source File
# Begin Source File
-SOURCE=.\my_winsem.c
-# End Source File
-# Begin Source File
-
SOURCE=.\my_winthread.c
# End Source File
# Begin Source File
--- 1.9/VC++Files/mysys/mysys.vcproj 2007-03-12 13:22:07 +01:00
+++ 1.10/VC++Files/mysys/mysys.vcproj 2007-03-12 13:22:07 +01:00
@@ -4324,49 +4324,6 @@
</FileConfiguration>
</File>
<File
- RelativePath="my_winsem.c">
- <FileConfiguration
- Name="Debug|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Max|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="Release|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="TLS_DEBUG|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="0"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- <FileConfiguration
- Name="TLS|Win32">
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- AdditionalIncludeDirectories=""
- PreprocessorDefinitions=""/>
- </FileConfiguration>
- </File>
- <File
RelativePath="my_winthread.c">
<FileConfiguration
Name="Debug|Win32">
--- 1.31/VC++Files/mysys/mysys.dsp 2007-03-12 13:22:07 +01:00
+++ 1.32/VC++Files/mysys/mysys.dsp 2007-03-12 13:22:07 +01:00
@@ -557,10 +557,6 @@
# End Source File
# Begin Source File
-SOURCE=.\my_winsem.c
-# End Source File
-# Begin Source File
-
SOURCE=.\my_winthread.c
# End Source File
# Begin Source File
| Thread |
|---|
| • bk commit into 5.0 tree (kent:1.2473) | kent | 12 Mar |
