Commit 955eb2f2 authored by unknown's avatar unknown
Browse files

Merge perch.ndb.mysql.com:/home/jonas/src/51-new 

into  perch.ndb.mysql.com:/home/jonas/src/51-ndb
parents 5c20cae8 722d9178

.bzrignore

+1 −0
Original line number Diff line number Diff line
@@ -1611,3 +1611,4 @@ vio/viotest-sslconnect.cpp 
vio/viotest.cpp

zlib/*.ds?

zlib/*.vcproj

BitKeeper/etc/RESYNC_TREE

BUILD/SETUP.sh

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ SSL_LIBRARY=--with-openssl 
global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wchar-subscripts -Wformat -Wparentheses -Wsign-compare -Wwrite-strings"

#debug_extra_warnings="-Wuninitialized"

c_warnings="$global_warnings -Wunused"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder"

cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"

base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition $SSL_LIBRARY"

base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-partition $SSL_LIBRARY"

max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-embedded-server --with-big-tables --with-partition $SSL_LIBRARY"

BitKeeper/etc/config

+1 −0
Original line number Diff line number Diff line
@@ -74,5 +74,6 @@ hours: 
[jonas:]checkout:get

[tomas:]checkout:get

[guilhem:]checkout:get

[pekka:]checkout:get

checkout:edit

eoln:unix

VC++Files/client/mysqldump.vcproj

+27 −0
Original line number Diff line number Diff line
@@ -226,6 +226,33 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql-common\my_user.c">

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

	</Files>

	<Globals>

	</Globals>

VC++Files/client/mysqlslap.vcproj

+3 −3
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ 
				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib mysqlclient.lib mysys.lib"

				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"

				OutputFile="../client_release/mysqlslap.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"
@@ -102,7 +102,7 @@ 
				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib mysqlclient.lib mysys.lib"

				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"

				OutputFile="../client_classic/mysqlslap.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"
@@ -162,7 +162,7 @@ 
				Name="VCCustomBuildTool"/>

			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib mysqlclient.lib mysys.lib"

				AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"

				OutputFile="../client_debug/mysqlslap.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"