Merge jmiller@bk-internal.mysql.com:/home/bk/mysql-5.1-new (816b7751) · Commits · Software / OSDI20 Artifacts / mariadb

VC++Files/client/mysqlslap.vcproj

+4 −3

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		ProjectType="Visual C++"
		Version="7.10"
		Name="mysqlslap"
		ProjectGUID="{2E9332CF-072A-4381-BF37-17C5AB4F8583}"
		SccProjectName=""
		SccLocalPath="">
		<Platforms>
		@@ -39,7 +40,7 @@
		Name="VCCustomBuildTool"/>
		<Tool
		Name="VCLinkerTool"
		AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
		AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib mysqlclient.lib mysys.lib"
		OutputFile="../client_release/mysqlslap.exe"
		LinkIncremental="1"
		SuppressStartupBanner="TRUE"
		@@ -101,7 +102,7 @@
		Name="VCCustomBuildTool"/>
		<Tool
		Name="VCLinkerTool"
		AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
		AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib mysqlclient.lib mysys.lib"
		OutputFile="../client_classic/mysqlslap.exe"
		LinkIncremental="1"
		SuppressStartupBanner="TRUE"
		@@ -161,7 +162,7 @@
		Name="VCCustomBuildTool"/>
		<Tool
		Name="VCLinkerTool"
		AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
		AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib mysqlclient.lib mysys.lib"
		OutputFile="../client_debug/mysqlslap.exe"
		LinkIncremental="1"
		SuppressStartupBanner="TRUE"

VC++Files/mysql.sln

+132 −10

Original line number	Diff line number	Diff line
		@@ -22,16 +22,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libmysqld", "libmysqld\libm
		ProjectSection(ProjectDependencies) = postProject
		{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
		{207E9014-C4D1-4F6D-B76F-BC7DD7E31113} = {207E9014-C4D1-4F6D-B76F-BC7DD7E31113}
		{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}
		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB} = {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}
		{DB28DE80-837F-4497-9AA9-CC0A20584C98} = {DB28DE80-837F-4497-9AA9-CC0A20584C98}
		{433BCD9B-15C5-4B11-B8BE-825EA98EACE6} = {433BCD9B-15C5-4B11-B8BE-825EA98EACE6}
		{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
		{B3BFA8E5-90CF-4794-96E0-0B03ACA57A30} = {B3BFA8E5-90CF-4794-96E0-0B03ACA57A30}
		{8A3A2CF1-E581-47CC-95DD-1D0DA85BE83B} = {8A3A2CF1-E581-47CC-95DD-1D0DA85BE83B}
		{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
		{86276BF8-FB93-49C8-8157-4F2181375CD0} = {86276BF8-FB93-49C8-8157-4F2181375CD0}
		{8A3A2CF1-E581-47CC-95DD-1D0DA85BE83B} = {8A3A2CF1-E581-47CC-95DD-1D0DA85BE83B}
		{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}
		{433BCD9B-15C5-4B11-B8BE-825EA98EACE6} = {433BCD9B-15C5-4B11-B8BE-825EA98EACE6}
		{B3BFA8E5-90CF-4794-96E0-0B03ACA57A30} = {B3BFA8E5-90CF-4794-96E0-0B03ACA57A30}
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myTest", "libmysqltest\myTest.vcproj", "{2794E434-7CCE-44DB-B2FB-789ABE53D6B9}"
		@@ -49,36 +49,36 @@ EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisam_ftdump", "myisam_ftdump\myisam_ftdump.vcproj", "{4C5D0EB1-B953-4BE9-A48B-4F3A874E6635}"
		ProjectSection(ProjectDependencies) = postProject
		{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
		{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}
		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
		{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
		{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisamchk", "myisamchk\myisamchk.vcproj", "{87CD9881-D234-4306-BBC6-0668C6168C0F}"
		ProjectSection(ProjectDependencies) = postProject
		{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
		{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}
		{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
		{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
		{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisamlog", "myisamlog\myisamlog.vcproj", "{194F5EE6-9440-4298-A6FE-A9B4B480B44C}"
		ProjectSection(ProjectDependencies) = postProject
		{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
		{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}
		{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
		{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
		{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "myisampack", "myisampack\myisampack.vcproj", "{EF833A1E-E358-4B6C-9C27-9489E85041CC}"
		ProjectSection(ProjectDependencies) = postProject
		{EEC1300B-85A5-497C-B3E1-F708021DF859} = {EEC1300B-85A5-497C-B3E1-F708021DF859}
		{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}
		{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
		{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
		{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysql", "client\mysql.vcproj", "{F9868FD3-7AE2-486D-BAB3-A299E11F6AC1}"
		@@ -124,14 +124,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqld", "sql\mysqld.vcproj
		{13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD} = {13A3EB35-EF87-42DC-AFD6-CDF5EFB228AD}
		{BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB} = {BA86AE72-0CF5-423D-BBA2-E12B0D72EBFB}
		{DB28DE80-837F-4497-9AA9-CC0A20584C98} = {DB28DE80-837F-4497-9AA9-CC0A20584C98}
		{433BCD9B-15C5-4B11-B8BE-825EA98EACE6} = {433BCD9B-15C5-4B11-B8BE-825EA98EACE6}
		{8762A9B8-72A9-462E-A9A2-F3265081F8AF} = {8762A9B8-72A9-462E-A9A2-F3265081F8AF}
		{F74653C4-8003-4A79-8F53-FC69E0AD7A9B} = {F74653C4-8003-4A79-8F53-FC69E0AD7A9B}
		{6B6812DB-636E-465D-B53D-5012F237E539} = {6B6812DB-636E-465D-B53D-5012F237E539}
		{44D9C7DC-6636-4B82-BD01-6876C64017DF} = {44D9C7DC-6636-4B82-BD01-6876C64017DF}
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B} = {4471CADD-737B-4AD7-A108-2FBAA1C4B03B}
		{B3BFA8E5-90CF-4794-96E0-0B03ACA57A30} = {B3BFA8E5-90CF-4794-96E0-0B03ACA57A30}
		{8A3A2CF1-E581-47CC-95DD-1D0DA85BE83B} = {8A3A2CF1-E581-47CC-95DD-1D0DA85BE83B}
		{FC369DF4-AEB7-4531-BF34-A638C4363BFE} = {FC369DF4-AEB7-4531-BF34-A638C4363BFE}
		{86276BF8-FB93-49C8-8157-4F2181375CD0} = {86276BF8-FB93-49C8-8157-4F2181375CD0}
		{433BCD9B-15C5-4B11-B8BE-825EA98EACE6} = {433BCD9B-15C5-4B11-B8BE-825EA98EACE6}
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqldemb", "mysqldemb\mysqldemb.vcproj", "{37D9BA79-302E-4582-A545-CB5FF7982EA3}"
		@@ -286,6 +288,18 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bdb", "storage\bdb\bdb.vcpr
		ProjectSection(ProjectDependencies) = postProject
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mysqlslap", "client\mysqlslap.vcproj", "{2E9332CF-072A-4381-BF37-17C5AB4F8583}"
		ProjectSection(ProjectDependencies) = postProject
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "archive", "storage\archive\archive.vcproj", "{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}"
		ProjectSection(ProjectDependencies) = postProject
		EndProjectSection
		EndProject
		Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "storage\example\example.vcproj", "{6B6812DB-636E-465D-B53D-5012F237E539}"
		ProjectSection(ProjectDependencies) = postProject
		EndProjectSection
		EndProject
		Global
		GlobalSection(SolutionConfiguration) = preSolution
		classic = classic
		@@ -1033,7 +1047,7 @@ Global
		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.ActiveCfg = TLS\|Win32
		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.classic nt.Build.0 = TLS\|Win32
		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug.ActiveCfg = TLS_DEBUG\|Win32
		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug.Build.0 = TLS_debug\|Win32
		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Debug.Build.0 = TLS_DEBUG\|Win32
		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Classic.ActiveCfg = Release\|Win32
		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Classic.Build.0 = Release\|Win32
		{44D9C7DC-6636-4B82-BD01-6876C64017DF}.Embedded_Debug.ActiveCfg = Debug\|Win32
		@@ -1654,6 +1668,114 @@ Global
		{B3BFA8E5-90CF-4794-96E0-0B03ACA57A30}.TLS.Build.0 = Debug\|Win32
		{B3BFA8E5-90CF-4794-96E0-0B03ACA57A30}.TLS_DEBUG.ActiveCfg = Debug\|Win32
		{B3BFA8E5-90CF-4794-96E0-0B03ACA57A30}.TLS_DEBUG.Build.0 = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.classic.ActiveCfg = classic\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.classic.Build.0 = classic\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.classic nt.ActiveCfg = classic\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.classic nt.Build.0 = classic\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Debug.ActiveCfg = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Debug.Build.0 = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Embedded_Classic.ActiveCfg = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Embedded_Classic.Build.0 = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Embedded_Debug.ActiveCfg = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Embedded_Debug.Build.0 = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Embedded_Pro.ActiveCfg = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Embedded_Pro.Build.0 = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Embedded_ProGPL.ActiveCfg = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Embedded_ProGPL.Build.0 = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Embedded_Release.ActiveCfg = Release\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Embedded_Release.Build.0 = Release\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max.ActiveCfg = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max.Build.0 = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max nt.ActiveCfg = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Max nt.Build.0 = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.nt.ActiveCfg = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.nt.Build.0 = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.pro.ActiveCfg = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.pro.Build.0 = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.pro gpl.ActiveCfg = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.pro gpl.Build.0 = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.pro gpl nt.ActiveCfg = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.pro gpl nt.Build.0 = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.pro nt.ActiveCfg = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.pro nt.Build.0 = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Release.ActiveCfg = Release\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.Release.Build.0 = Release\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.TLS.ActiveCfg = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.TLS.Build.0 = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.TLS_DEBUG.ActiveCfg = Debug\|Win32
		{2E9332CF-072A-4381-BF37-17C5AB4F8583}.TLS_DEBUG.Build.0 = Debug\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.classic.ActiveCfg = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.classic.Build.0 = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.classic nt.ActiveCfg = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.classic nt.Build.0 = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Debug.ActiveCfg = Debug\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Debug.Build.0 = Debug\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Classic.ActiveCfg = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Classic.Build.0 = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Debug.ActiveCfg = Debug\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Debug.Build.0 = Debug\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Pro.ActiveCfg = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Pro.Build.0 = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_ProGPL.ActiveCfg = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_ProGPL.Build.0 = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Release.ActiveCfg = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Embedded_Release.Build.0 = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Max.ActiveCfg = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Max.Build.0 = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Max nt.ActiveCfg = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Max nt.Build.0 = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.nt.ActiveCfg = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.nt.Build.0 = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro.ActiveCfg = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro.Build.0 = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro gpl.ActiveCfg = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro gpl.Build.0 = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro gpl nt.ActiveCfg = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro gpl nt.Build.0 = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro nt.ActiveCfg = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.pro nt.Build.0 = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Release.ActiveCfg = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.Release.Build.0 = Release\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.TLS.ActiveCfg = TLS\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.TLS.Build.0 = TLS\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.TLS_DEBUG.ActiveCfg = TLS_DEBUG\|Win32
		{4471CADD-737B-4AD7-A108-2FBAA1C4B03B}.TLS_DEBUG.Build.0 = TLS_DEBUG\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.classic.ActiveCfg = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.classic.Build.0 = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.classic nt.ActiveCfg = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.classic nt.Build.0 = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Debug.ActiveCfg = Debug\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Debug.Build.0 = Debug\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Classic.ActiveCfg = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Classic.Build.0 = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Debug.ActiveCfg = Debug\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Debug.Build.0 = Debug\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Pro.ActiveCfg = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Pro.Build.0 = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_ProGPL.ActiveCfg = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_ProGPL.Build.0 = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Release.ActiveCfg = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Embedded_Release.Build.0 = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Max.ActiveCfg = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Max.Build.0 = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Max nt.ActiveCfg = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Max nt.Build.0 = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.nt.ActiveCfg = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.nt.Build.0 = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.pro.ActiveCfg = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.pro.Build.0 = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.pro gpl.ActiveCfg = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.pro gpl.Build.0 = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.pro gpl nt.ActiveCfg = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.pro gpl nt.Build.0 = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.pro nt.ActiveCfg = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.pro nt.Build.0 = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Release.ActiveCfg = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.Release.Build.0 = Release\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.TLS.ActiveCfg = TLS\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.TLS.Build.0 = TLS\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.TLS_DEBUG.ActiveCfg = TLS_DEBUG\|Win32
		{6B6812DB-636E-465D-B53D-5012F237E539}.TLS_DEBUG.Build.0 = TLS_DEBUG\|Win32
		EndGlobalSection
		GlobalSection(ExtensibilityGlobals) = postSolution
		EndGlobalSection

VC++Files/mysqlbinlog/mysqlbinlog.vcproj

+135 −0

Original line number	Diff line number	Diff line
		@@ -229,6 +229,141 @@
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		</File>
		<File
		RelativePath="..\mysys\my_new.cpp">
		<FileConfiguration
		Name="Debug\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="0"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="classic\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="Release\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		</File>
		<File
		RelativePath="..\mysys\my_bit.c">
		<FileConfiguration
		Name="Debug\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="0"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="classic\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="Release\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		</File>
		<File
		RelativePath="..\mysys\my_bitmap.c">
		<FileConfiguration
		Name="Debug\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="0"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="classic\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="Release\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		</File>
		<File
		RelativePath="..\mysys\my_vle.c">
		<FileConfiguration
		Name="Debug\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="0"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="classic\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="Release\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		</File>
		<File
		RelativePath="..\mysys\base64.c">
		<FileConfiguration
		Name="Debug\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="0"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="classic\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		<FileConfiguration
		Name="Release\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		</File>
		<File
		RelativePath="..\client\mysqlbinlog.cpp">
		<FileConfiguration

VC++Files/mysqldemb/mysqldemb.vcproj

+3 −3

Original line number	Diff line number	Diff line
		@@ -75,7 +75,7 @@
		Optimization="2"
		InlineFunctionExpansion="1"
		AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib"
		PreprocessorDefinitions="WIN32;_LIB;SIGNAL_WITH_VIO_CLOSE;EMBEDDED_LIBRARY;USE_TLS;__WIN__;USE_SYMDIR;MYSQL_SERVER;LICENSE=Commercial;HAVE_DLOPEN;HAVE_INNOBASE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE;WITH_INNOBASE_STORAGE_ENGINE"
		PreprocessorDefinitions="WIN32;_LIB;SIGNAL_WITH_VIO_CLOSE;EMBEDDED_LIBRARY;USE_TLS;__WIN__;USE_SYMDIR;MYSQL_SERVER;LICENSE=Commercial;HAVE_DLOPEN;HAVE_INNOBASE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE;WITH_INNOBASE_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION"
		StringPooling="TRUE"
		RuntimeLibrary="0"
		EnableFunctionLevelLinking="TRUE"
		@@ -125,7 +125,7 @@
		Name="VCCLCompilerTool"
		Optimization="0"
		AdditionalIncludeDirectories="../zlib,../include,../regex,../libmysqld,../sql,../storage/bdb/build_win32"
		PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;USE_TLS;__WIN__;WITH_INNOBASE_STORAGE_ENGINE"
		PreprocessorDefinitions="WIN32;_DEBUG;_LIB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;USE_TLS;__WIN__;WITH_INNOBASE_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION"
		BasicRuntimeChecks="3"
		RuntimeLibrary="1"
		PrecompiledHeaderFile=".\Debug/mysqldemb.pch"
		@@ -176,7 +176,7 @@
		Optimization="2"
		InlineFunctionExpansion="1"
		AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../storage/bdb/build_win32,../zlib"
		PreprocessorDefinitions="WIN32;NDEBUG;_LIB;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;__WIN__;WITH_INNOBASE_STORAGE_ENGINE"
		PreprocessorDefinitions="WIN32;NDEBUG;_LIB;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;__WIN__;WITH_INNOBASE_STORAGE_ENGINE;HAVE_ROW_BASED_REPLICATION"
		StringPooling="TRUE"
		RuntimeLibrary="0"
		EnableFunctionLevelLinking="TRUE"

VC++Files/mysys/mysys.vcproj

+87 −0

Original line number	Diff line number	Diff line
		@@ -305,6 +305,50 @@
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		</File>
		<File
		RelativePath="base64.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=""
		BrowseInformation="1"/>
		</FileConfiguration>
		<FileConfiguration
		Name="TLS\|Win32">
		<Tool
		Name="VCCLCompilerTool"
		Optimization="2"
		AdditionalIncludeDirectories=""
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		</File>
		<File
		RelativePath="charset-def.c">
		<FileConfiguration
		@@ -4267,6 +4311,49 @@
		PreprocessorDefinitions=""/>
		</FileConfiguration>
		</File>
		<File
		RelativePath="my_vle.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="mysys_priv.h">
		</File>