Commit b6515184 authored by unknown's avatar unknown
Browse files

Merge bk@192.168.21.1:mysql-5.0 

into  mysql.com:/home/hf/work/mrg/mysql-5.0-opt


mysql-test/r/gis-rtree.result:
  Auto merged
parents ff810fb9 26a7c7ed

EXCEPTIONS-CLIENT

+4 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ The MySQL AB Exception for Free/Libre and Open Source 
Software-only Applications Using MySQL Client Libraries (the

"FLOSS Exception").



Version 0.5, 30 August 2006

Version 0.6, 7 March 2007



Exception Intent
@@ -59,10 +59,12 @@ Apache Software License 1.0/1.1/2.0 
Apple Public Source License 2.0

Artistic license From Perl 5.8.0

BSD license "July 22 1999"

Common Development and Distribution License (CDDL) 1.0

Common Public License 1.0

Eclipse Public License 1.0

GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1

Jabber Open Source License 1.0

MIT license ---

MIT license (As listed in file MIT-License.txt) ---

Mozilla Public License (MPL) 1.0/1.1

Open Software License 2.0

OpenSSL license (with original SSLeay license) "2003" ("1998")

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

+3 −2
Original line number Diff line number Diff line
@@ -778,8 +778,9 @@ 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))

# For the sched_yield() function on Solaris

AC_CHECK_FUNC(sched_yield, , AC_CHECK_LIB(posix4, sched_yield))



MYSQL_CHECK_ZLIB_WITH_COMPRESS



# For large pages support