Commit 1c02d8c0 authored by unknown's avatar unknown
Browse files

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0 

into  mysql.com:/home/kent/bk/tmp/mysql-5.0-build
parents 8205e16c e8bc4421

VC++Files/mysys/mysys.dsp

+0 −4
Original line number Diff line number Diff line
@@ -557,10 +557,6 @@ SOURCE=.\my_windac.c 
# 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

VC++Files/mysys/mysys.vcproj

+0 −43
Original line number Diff line number Diff line
@@ -4323,49 +4323,6 @@ 
					PreprocessorDefinitions=""/>

			</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

VC++Files/mysys/mysys_ia64.dsp

+0 −4
Original line number Diff line number Diff line
@@ -538,10 +538,6 @@ SOURCE=.\my_wincond.c 
# 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

configure.in

+0 −2
Original line number Diff line number Diff line
@@ -778,8 +778,6 @@ AC_CHECK_FUNC(bind, , AC_CHECK_LIB(bind, bind)) 
# 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

include/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ HEADERS_ABI = mysql.h mysql_com.h mysql_time.h \ 
			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 \