Commit 168515a1 authored by unknown's avatar unknown
Browse files

Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50 

into  quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50
parents ff07adae 6d93f150

BUILD/check-cpu

+4 −0
Original line number Diff line number Diff line
@@ -114,6 +114,10 @@ check_cpu () { 
    *i386*i486*)

      cpu_arg="pentium-m";

      ;;

    #Core 2 Duo  

    *Intel*Core\(TM\)2*)

      cpu_arg="nocona";

      ;;



    # Intel ia64

    *Itanium*)

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