Commit 5dd6e877 authored by unknown's avatar unknown
Browse files

updated some vcproj files and the .sln file 


VC++Files/mysql.sln:
  updated locations of storage engines
VC++Files/sql/mysqld.vcproj:
  modified some include directories for storage engines
  added some new files
VC++Files/storage/bdb/bdb.vcproj:
  moved storage engine under storage folder
VC++Files/storage/heap/heap.vcproj:
  moved storage engine under storage folder
VC++Files/storage/innobase/innobase.vcproj:
  moved storage engine under storage folder
VC++Files/storage/myisam/myisam.vcproj:
  moved storage engine under storage folder
VC++Files/storage/myisammrg/myisammrg.vcproj:
  moved storage engine under storage folder
parent 8d7cbdac

VC++Files/mysql.sln

+321 −155

File changed.

Preview size limit exceeded, changes collapsed.

VC++Files/sql/mysqld.vcproj

+8 −74
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ 
				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"

				AdditionalIncludeDirectories="../storage/bdb/build_win32,../include,../regex,../extra/yassl/include,../zlib"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;HAVE_INNOBASE_DB;HAVE_BERKELEY_DB;HAVE_ARCHIVE_DB;HAVE_BLACKHOLE_DB;HAVE_FEDERATED_DB;MYSQL_SERVER;_WINDOWS;_CONSOLE;HAVE_DLOPEN"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/mysqld.pch"
@@ -3670,79 +3670,7 @@ 
			</FileConfiguration>

		</File>

		<File

			RelativePath="..\myisammrg\myrg_rnext_same.c">

			<FileConfiguration

				Name="classic nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Max|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Max nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro nt|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					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>

			RelativePath="..\storage\myisammrg\myrg_rnext_same.c">

		</File>

		<File

			RelativePath="mysqld.cpp">
@@ -4728,6 +4656,9 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath=".\rpl_filter.cpp">

		</File>

		<File

			RelativePath="set_var.cpp">

			<FileConfiguration
@@ -6917,6 +6848,9 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath=".\sql_partition.cpp">

		</File>

		<File

			RelativePath="sql_prepare.cpp">

			<FileConfiguration

VC++Files/bdb/bdb.vcproj→VC++Files/storage/bdb/bdb.vcproj

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
	ProjectType="Visual C++"

	Version="7.10"

	Name="bdb"

	ProjectGUID="{FB168572-FFF4-4503-9331-4E958459DC9D}"

	SccProjectName=""

	SccLocalPath="">

	<Platforms>

VC++Files/heap/heap.vcproj→VC++Files/storage/heap/heap.vcproj

+5 −4
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
	ProjectType="Visual C++"

	Version="7.10"

	Name="heap"

	ProjectGUID="{603E5567-F3CD-4547-9F2B-E0082B702B0D}"

	SccProjectName=""

	SccLocalPath="">

	<Platforms>
@@ -22,7 +23,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include"

				AdditionalIncludeDirectories="../../include"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -71,7 +72,7 @@ 
				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include"

				AdditionalIncludeDirectories="../../include"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS"

				StringPooling="TRUE"

				RuntimeLibrary="1"
@@ -121,7 +122,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include"

				AdditionalIncludeDirectories="../../include"

				PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG;USE_TLS"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -170,7 +171,7 @@ 
				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../include"

				AdditionalIncludeDirectories="../../include"

				PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS"

				StringPooling="TRUE"

				RuntimeLibrary="1"

VC++Files/innobase/innobase.vcproj→VC++Files/storage/innobase/innobase.vcproj

+5 −4
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
	ProjectType="Visual C++"

	Version="7.10"

	Name="innobase"

	ProjectGUID="{AEFFF9CA-3387-4027-B569-33D5D26887D1}"

	SccProjectName=""

	SccLocalPath="">

	<Platforms>
@@ -24,7 +25,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../innobase/include,../include"

				AdditionalIncludeDirectories="include, ../../include"

				PreprocessorDefinitions="_LIB;_WIN32;WIN32;NDEBUG;MYSQL_SERVER"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -75,7 +76,7 @@ 
				Name="VCCLCompilerTool"

				Optimization="0"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../innobase/include,../include"

				AdditionalIncludeDirectories="include, ../../include"

				PreprocessorDefinitions="NDEBUG;_LIB;_WIN32;WIN32;MYSQL_SERVER"

				RuntimeLibrary="1"

				PrecompiledHeaderFile=".\debug/innobase.pch"
@@ -126,7 +127,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../innobase/include,../include"

				AdditionalIncludeDirectories="include, ../../include"

				PreprocessorDefinitions="_LIB;_WIN32;WIN32;MYSQL_SERVER;NDEBUG"

				StringPooling="TRUE"

				RuntimeLibrary="0"
@@ -179,7 +180,7 @@ 
				Optimization="2"

				InlineFunctionExpansion="1"

				OptimizeForProcessor="2"

				AdditionalIncludeDirectories="../innobase/include,../include"

				AdditionalIncludeDirectories="include, ../../include"

				PreprocessorDefinitions="_LIB;_WIN32;WIN32;NDEBUG;MYSQL_SERVER"

				StringPooling="TRUE"

				RuntimeLibrary="0"