Commit 1d09be38 authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

Merge trift2.:/MySQL/M41/clone-4.1 

into  trift2.:/MySQL/M41/push-4.1
parents b9cc9dbb bd0b478e

VC++Files/mysql.sln

+1 −0
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlserver", "mysqlserver\ 
		{C70A6DC7-7D45-4C16-8654-7E57713A4C04} = {C70A6DC7-7D45-4C16-8654-7E57713A4C04}

		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}

		{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}

		{F74653C4-8003-4A79-8F53-FC69E0AD7A9B} = {F74653C4-8003-4A79-8F53-FC69E0AD7A9B}

	EndProjectSection

EndProject

Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlshow", "client\mysqlshow.vcproj", "{3737BFE2-EF25-464F-994D-BD28A9F84528}"

VC++Files/mysqldemb/mysqldemb.vcproj

+577 −1
Original line number Diff line number Diff line
@@ -901,6 +901,42 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\item_geofunc.cpp">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\item_row.cpp">

			<FileConfiguration
@@ -1225,6 +1261,222 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\libmysql\libmysql.c">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\libmysql\client.c">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\libmysql\pack.c">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\libmysql\my_time.c">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\set_var.cpp">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\strfunc.cpp">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\lock.cpp">

			<FileConfiguration
@@ -1478,7 +1730,7 @@ 
			</FileConfiguration>

		</File>

		<File

			RelativePath="..\libmysql\password.c">

			RelativePath="..\sql\password.c">

			<FileConfiguration

				Name="classic|Win32">

				<Tool
@@ -2989,6 +3241,330 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\discover.cpp">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\gstream.cpp">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\spatial.cpp">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\sql_help.cpp">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\sql_load.cpp">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\sql_state.c">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\stacktrace.c">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\sql\tztime.cpp">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="..\libmysqld\emb_qcache.cpp">

			<FileConfiguration

				Name="classic|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""

					BasicRuntimeChecks="3"/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

	</Files>

	<Globals>

	</Globals>

VC++Files/sql/mysqld.vcproj

+41 −5
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
				ProgramDataBaseFileName=".\classic_nt/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="1"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>
@@ -44,6 +45,10 @@ 
				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="../client_classic/mysqld-nt.pdb"

				GenerateMapFile="TRUE"

				MapFileName="../client_classic/mysqld-nt.map"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool
@@ -95,6 +100,7 @@ 
				ProgramDataBaseFileName=".\max/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="1"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>
@@ -104,6 +110,10 @@ 
				OutputFile="../client_release/mysqld-max.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="../client_release/mysqld-max.pdb"

				GenerateMapFile="TRUE"

				MapFileName="../client_release/mysqld-max.map"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool
@@ -155,6 +165,7 @@ 
				ProgramDataBaseFileName=".\max_nt/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="1"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>
@@ -164,9 +175,10 @@ 
				OutputFile="../client_release/mysqld-max-nt.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				ProgramDatabaseFile=".\max_nt/mysqld-max-nt.pdb"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="../client_release/mysqld-max-nt.pdb"

				GenerateMapFile="TRUE"

				MapFileName=".\max_nt/mysqld-max-nt.map"

				MapFileName="../client_release/mysqld-max-nt.map"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool
@@ -218,6 +230,7 @@ 
				ProgramDataBaseFileName=".\nt/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="1"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>
@@ -227,9 +240,10 @@ 
				OutputFile="../client_release/mysqld-nt.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				ProgramDatabaseFile=".\nt/mysqld-nt.pdb"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="../client_release/mysqld-nt.pdb"

				GenerateMapFile="TRUE"

				MapFileName=".\nt/mysqld-nt.map"

				MapFileName="../client_release/mysqld-nt.map"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool
@@ -281,6 +295,7 @@ 
				ProgramDataBaseFileName=".\pro_nt/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="1"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>
@@ -291,6 +306,10 @@ 
				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="../client_pro/mysqld-nt.pdb"

				GenerateMapFile="TRUE"

				MapFileName="../client_pro/mysqld-nt.map"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool
@@ -350,7 +369,9 @@ 
				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile=".\debug/mysqld-debug.pdb"

				ProgramDatabaseFile="../client_debug/mysqld-debug.pdb"

				GenerateMapFile="TRUE"

				MapFileName="../client_debug/mysqld-debug.map"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool
@@ -402,6 +423,7 @@ 
				ProgramDataBaseFileName=".\pro/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="1"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>
@@ -412,6 +434,10 @@ 
				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="../client_pro/mysqld.pdb"

				GenerateMapFile="TRUE"

				MapFileName="../client_pro/mysqld.map"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool
@@ -463,6 +489,7 @@ 
				ProgramDataBaseFileName=".\classic/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="1"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>
@@ -473,6 +500,10 @@ 
				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				AdditionalLibraryDirectories=""

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="../client_classic/mysqld.pdb"

				GenerateMapFile="TRUE"

				MapFileName="../client_classic/mysqld.map"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool
@@ -524,6 +555,7 @@ 
				ProgramDataBaseFileName=".\release/"

				WarningLevel="3"

				SuppressStartupBanner="TRUE"

				DebugInformationFormat="1"

				CompileAs="0"/>

			<Tool

				Name="VCCustomBuildTool"/>
@@ -533,6 +565,10 @@ 
				OutputFile="../client_release/mysqld.exe"

				LinkIncremental="1"

				SuppressStartupBanner="TRUE"

				GenerateDebugInformation="TRUE"

				ProgramDatabaseFile="../client_release/mysqld.pdb"

				GenerateMapFile="TRUE"

				MapFileName="../client_release/mysqld.map"

				SubSystem="1"

				TargetMachine="1"/>

			<Tool

libmysqld/libmysqld.def

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ EXPORTS 
	my_print_variables

	my_realloc

	my_strdup

	my_thread_end

	my_thread_init

	mysql_thread_end

	mysql_thread_init

	myodbc_remove_escape

	mysql_affected_rows

	mysql_autocommit

sql/sql_parse.cc

+4 −1
Original line number Diff line number Diff line
@@ -909,9 +909,12 @@ static int check_connection(THD *thd) 
    Old clients send null-terminated string as password; new clients send

    the size (1 byte) + string (not null-terminated). Hence in case of empty

    password both send '\0'.



    Cast *passwd to an unsigned char, so that it doesn't extend the sign for

    *passwd > 127 and become 2**32-127 after casting to uint.

  */

  uint passwd_len= thd->client_capabilities & CLIENT_SECURE_CONNECTION ?

    *passwd++ : strlen(passwd);

    (uchar)(*passwd++) : strlen(passwd);

  db= thd->client_capabilities & CLIENT_CONNECT_WITH_DB ?

    db + passwd_len + 1 : 0;

  uint db_len= db ? strlen(db) : 0;