diff options
| author | unknown <knielsen@mysql.com> | 2005-12-22 13:18:06 +0100 |
|---|---|---|
| committer | unknown <knielsen@mysql.com> | 2005-12-22 13:18:06 +0100 |
| commit | 588d205be922cbf56d52543da36422b0eed6cbc8 (patch) | |
| tree | a72cb26e1e06050098acf448a283c1bd75bdd13b | |
| parent | 973949d0b3d17ae70099345306f08f15e174bef2 (diff) | |
| download | mariadb-git-588d205be922cbf56d52543da36422b0eed6cbc8.tar.gz | |
Cleanup "make dist" and Windows builds after push of pluggable storage engines.
| -rw-r--r-- | VC++Files/sql/mysqld.dsp | 4 | ||||
| -rw-r--r-- | VC++Files/sql/mysqld.vcproj | 81 | ||||
| -rw-r--r-- | libmysqld/Makefile.am | 2 |
3 files changed, 1 insertions, 86 deletions
diff --git a/VC++Files/sql/mysqld.dsp b/VC++Files/sql/mysqld.dsp index ce8e36fde56..1d8fa70471c 100644 --- a/VC++Files/sql/mysqld.dsp +++ b/VC++Files/sql/mysqld.dsp @@ -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 diff --git a/VC++Files/sql/mysqld.vcproj b/VC++Files/sql/mysqld.vcproj index 29448226406..28f360a2fa2 100644 --- a/VC++Files/sql/mysqld.vcproj +++ b/VC++Files/sql/mysqld.vcproj @@ -1491,87 +1491,6 @@ </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 Name="classic nt|Win32" diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 12531a553eb..162336a6c0b 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -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= |