Commit 588d205b authored by unknown's avatar unknown
Browse files

Cleanup "make dist" and Windows builds after push of pluggable storage engines.

parent 973949d0

VC++Files/sql/mysqld.dsp

+0 −4
Original line number Diff line number Diff line
@@ -460,10 +460,6 @@ SOURCE=.\ha_archive.cpp 
# End Source File

# Begin Source File



SOURCE=.\examples\ha_example.cpp

# End Source File

# Begin Source File



SOURCE=.\ha_blackhole.cpp

# End Source File

# Begin Source File

VC++Files/sql/mysqld.vcproj

+0 −81
Original line number Diff line number Diff line
@@ -1490,87 +1490,6 @@ 
					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="examples\ha_example.cpp">

			<FileConfiguration

				Name="classic nt|Win32"

				ExcludedFromBuild="TRUE">

				<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"

				ExcludedFromBuild="TRUE">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro nt|Win32"

				ExcludedFromBuild="TRUE">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Debug|Win32">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="0"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="pro|Win32"

				ExcludedFromBuild="TRUE">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="classic|Win32"

				ExcludedFromBuild="TRUE">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

			<FileConfiguration

				Name="Release|Win32"

				ExcludedFromBuild="TRUE">

				<Tool

					Name="VCCLCompilerTool"

					Optimization="2"

					AdditionalIncludeDirectories=""

					PreprocessorDefinitions=""/>

			</FileConfiguration>

		</File>

		<File

			RelativePath="ha_federated.cpp">

			<FileConfiguration

libmysqld/Makefile.am

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ sqlsources = derror.cc field.cc field_conv.cc strfunc.cc filesort.cc \ 
libmysqld_int_a_SOURCES= $(libmysqld_sources) $(libmysqlsources) $(sqlsources)

EXTRA_libmysqld_a_SOURCES =	ha_innodb.cc ha_berkeley.cc ha_archive.cc \

			ha_blackhole.cc ha_federated.cc ha_ndbcluster.cc \

			ha_tina.cc ha_example.cc ha_partition.cc

			ha_partition.cc

libmysqld_a_DEPENDENCIES= @mysql_se_objs@

libmysqld_a_SOURCES=