Skip to content

M
mariadb
Commit adf4f635 authored by unknown's avatar unknown
Browse files
Options

Merge trift2.:/MySQL/M50/clone-5.0 

into  trift2.:/MySQL/M50/push-5.0


sql/mysql_priv.h:
  Auto merged
parents a936a944 f5e1dad7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3648 additions and 37763 deletions
.bzrignore
View file @ adf4f635
...@@ -1337,3 +1337,5 @@ win/vs71cache.txt ...@@ -1337,3 +1337,5 @@ win/vs71cache.txt
win/vs8cache.txt win/vs8cache.txt
zlib/*.ds? zlib/*.ds?
zlib/*.vcproj zlib/*.vcproj
netware/init_db.sql
netware/test_db.sql
VC++Files/bdb/bdb.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/client/mysql.vcproj
View file @ adf4f635
...@@ -10,74 +10,10 @@ ...@@ -10,74 +10,10 @@
Name="Win32"/> Name="Win32"/>
</Platforms> </Platforms>
<Configurations> <Configurations>
<Configuration
Name="classic|Win32"
OutputDirectory=".\classic"
IntermediateDirectory=".\classic"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../,../extra/yassl/include"
PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\classic/mysql.pch"
AssemblerListingLocation=".\classic/"
ObjectFile=".\classic/"
ProgramDataBaseFileName=".\classic/"
WarningLevel="3"
WarnAsError="TRUE"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_classic/mysql.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\classic/mysql.pdb"
SubSystem="1"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\classic/mysql.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory=".\release" OutputDirectory=".\release_obj"
IntermediateDirectory=".\release" IntermediateDirectory=".\release_obj"
ConfigurationType="1" ConfigurationType="1"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE" ATLMinimizesCRunTimeLibraryUsage="FALSE"
...@@ -92,19 +28,20 @@ ...@@ -92,19 +28,20 @@
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\release/mysql.pch" PrecompiledHeaderFile=".\release_obj/mysql.pch"
AssemblerListingLocation=".\release/" AssemblerListingLocation=".\release_obj/"
ObjectFile=".\release/" ObjectFile=".\release_obj/"
ProgramDataBaseFileName=".\release/" ProgramDataBaseFileName=".\release_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1"
CompileAs="0"/> CompileAs="0"/>
<Tool <Tool
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib" AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_release/mysql.exe" OutputFile=".\release/mysql.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
...@@ -114,7 +51,7 @@ ...@@ -114,7 +51,7 @@
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TypeLibraryName=".\release/mysql.tlb" TypeLibraryName=".\release_obj/mysql.tlb"
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool"/> Name="VCPostBuildEventTool"/>
...@@ -139,8 +76,8 @@ ...@@ -139,8 +76,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory=".\debug" OutputDirectory=".\debug_obj"
IntermediateDirectory=".\debug" IntermediateDirectory=".\debug_obj"
ConfigurationType="1" ConfigurationType="1"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE" ATLMinimizesCRunTimeLibraryUsage="FALSE"
...@@ -151,11 +88,12 @@ ...@@ -151,11 +88,12 @@
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../,../extra/yassl/include" AdditionalIncludeDirectories="../include,../,../extra/yassl/include"
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS" PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
PrecompiledHeaderFile=".\debug/mysql.pch" PrecompiledHeaderFile=".\debug_obj/mysql.pch"
AssemblerListingLocation=".\debug/" AssemblerListingLocation=".\debug_obj/"
ObjectFile=".\debug/" ObjectFile=".\debug_obj/"
ProgramDataBaseFileName=".\debug/" ProgramDataBaseFileName=".\debug_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1" DebugInformationFormat="1"
...@@ -165,7 +103,7 @@ ...@@ -165,7 +103,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib" AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_debug/mysql.exe" OutputFile=".\debug/mysql.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
...@@ -175,7 +113,7 @@ ...@@ -175,7 +113,7 @@
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TypeLibraryName=".\debug/mysql.tlb" TypeLibraryName=".\debug_obj/mysql.tlb"
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool"/> Name="VCPostBuildEventTool"/>
...@@ -204,113 +142,15 @@ ...@@ -204,113 +142,15 @@
<Files> <Files>
<File <File
RelativePath="completion_hash.cpp"> RelativePath="completion_hash.cpp">
<FileConfiguration
Name="classic|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="mysql.cpp"> RelativePath="mysql.cpp">
<FileConfiguration
Name="classic|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
DebugInformationFormat="3"/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
DebugInformationFormat="3"/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="readline.cpp"> RelativePath="readline.cpp">
<FileConfiguration
Name="classic|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="sql_string.cpp"> RelativePath="sql_string.cpp">
<FileConfiguration
Name="classic|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File> </File>
</Files> </Files>
<Globals> <Globals>
......
VC++Files/client/mysql_upgrade.vcproj
View file @ adf4f635
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory=".\debug" OutputDirectory=".\debug_obj"
IntermediateDirectory=".\debug" IntermediateDirectory=".\debug_obj"
ConfigurationType="1" ConfigurationType="1"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE" ATLMinimizesCRunTimeLibraryUsage="FALSE"
...@@ -24,11 +24,12 @@ ...@@ -24,11 +24,12 @@
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../" AdditionalIncludeDirectories="../include,../"
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS" PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
PrecompiledHeaderFile=".\debug/mysql_upgrade.pch" PrecompiledHeaderFile=".\debug_obj/mysql_upgrade.pch"
AssemblerListingLocation=".\debug/" AssemblerListingLocation=".\debug_obj/"
ObjectFile=".\debug/" ObjectFile=".\debug_obj/"
ProgramDataBaseFileName=".\debug/" ProgramDataBaseFileName=".\debug_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1" DebugInformationFormat="1"
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib setargv.obj" AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib setargv.obj"
OutputFile="../client_debug/mysql_upgrade.exe" OutputFile=".\debug/mysql_upgrade.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
...@@ -48,7 +49,7 @@ ...@@ -48,7 +49,7 @@
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TypeLibraryName=".\debug/mysql_upgrade.tlb" TypeLibraryName=".\debug_obj/mysql_upgrade.tlb"
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool"/> Name="VCPostBuildEventTool"/>
...@@ -73,8 +74,8 @@ ...@@ -73,8 +74,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory=".\release" OutputDirectory=".\release_obj"
IntermediateDirectory=".\release" IntermediateDirectory=".\release_obj"
ConfigurationType="1" ConfigurationType="1"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE" ATLMinimizesCRunTimeLibraryUsage="FALSE"
...@@ -85,23 +86,24 @@ ...@@ -85,23 +86,24 @@
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../" AdditionalIncludeDirectories="../include,../"
PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG" PreprocessorDefinitions="DBUG_OFF;NDEBUG;_CONSOLE;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\release/mysql_upgrade.pch" PrecompiledHeaderFile=".\release_obj/mysql_upgrade.pch"
AssemblerListingLocation=".\release/" AssemblerListingLocation=".\release_obj/"
ObjectFile=".\release/" ObjectFile=".\release_obj/"
ProgramDataBaseFileName=".\release/" ProgramDataBaseFileName=".\release_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1"
CompileAs="0"/> CompileAs="0"/>
<Tool <Tool
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib" AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_release/mysql_upgrade.exe" OutputFile=".\release/mysql_upgrade.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
...@@ -110,69 +112,7 @@ ...@@ -110,69 +112,7 @@
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TypeLibraryName=".\release/mysql_upgrade.tlb" TypeLibraryName=".\release_obj/mysql_upgrade.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="classic|Win32"
OutputDirectory=".\classic"
IntermediateDirectory=".\classic"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../"
PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\classic/mysql_upgrade.pch"
AssemblerListingLocation=".\classic/"
ObjectFile=".\classic/"
ProgramDataBaseFileName=".\classic/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_classic/mysql_upgrade.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
ProgramDatabaseFile=".\classic/mysql_upgrade.pdb"
SubSystem="1"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\classic/mysql_upgrade.tlb"
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool"/> Name="VCPostBuildEventTool"/>
...@@ -201,30 +141,6 @@ ...@@ -201,30 +141,6 @@
<Files> <Files>
<File <File
RelativePath="mysql_upgrade.c"> RelativePath="mysql_upgrade.c">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="classic|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File> </File>
</Files> </Files>
<Globals> <Globals>
......
VC++Files/client/mysqladmin.vcproj
View file @ adf4f635
...@@ -10,72 +10,10 @@ ...@@ -10,72 +10,10 @@
Name="Win32"/> Name="Win32"/>
</Platforms> </Platforms>
<Configurations> <Configurations>
<Configuration
Name="classic|Win32"
OutputDirectory=".\classic"
IntermediateDirectory=".\classic"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../"
PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\classic/mysqladmin.pch"
AssemblerListingLocation=".\classic/"
ObjectFile=".\classic/"
ProgramDataBaseFileName=".\classic/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_classic/mysqladmin.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
ProgramDatabaseFile=".\classic/mysqladmin.pdb"
SubSystem="1"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\classic/mysqladmin.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory=".\release" OutputDirectory=".\release_obj"
IntermediateDirectory=".\release" IntermediateDirectory=".\release_obj"
ConfigurationType="1" ConfigurationType="1"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE" ATLMinimizesCRunTimeLibraryUsage="FALSE"
...@@ -86,23 +24,24 @@ ...@@ -86,23 +24,24 @@
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../" AdditionalIncludeDirectories="../include,../"
PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG" PreprocessorDefinitions="DBUG_OFF;NDEBUG;_CONSOLE;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\release/mysqladmin.pch" PrecompiledHeaderFile=".\release_obj/mysqladmin.pch"
AssemblerListingLocation=".\release/" AssemblerListingLocation=".\release_obj/"
ObjectFile=".\release/" ObjectFile=".\release_obj/"
ProgramDataBaseFileName=".\release/" ProgramDataBaseFileName=".\release_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1"
CompileAs="0"/> CompileAs="0"/>
<Tool <Tool
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib" AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_release/mysqladmin.exe" OutputFile=".\release/mysqladmin.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
...@@ -111,7 +50,7 @@ ...@@ -111,7 +50,7 @@
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TypeLibraryName=".\release/mysqladmin.tlb" TypeLibraryName=".\release_obj/mysqladmin.tlb"
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool"/> Name="VCPostBuildEventTool"/>
...@@ -136,8 +75,8 @@ ...@@ -136,8 +75,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory=".\debug" OutputDirectory=".\debug_obj"
IntermediateDirectory=".\debug" IntermediateDirectory=".\debug_obj"
ConfigurationType="1" ConfigurationType="1"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE" ATLMinimizesCRunTimeLibraryUsage="FALSE"
...@@ -148,11 +87,12 @@ ...@@ -148,11 +87,12 @@
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../" AdditionalIncludeDirectories="../include,../"
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS" PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
PrecompiledHeaderFile=".\debug/mysqladmin.pch" PrecompiledHeaderFile=".\debug_obj/mysqladmin.pch"
AssemblerListingLocation=".\debug/" AssemblerListingLocation=".\debug_obj/"
ObjectFile=".\debug/" ObjectFile=".\debug_obj/"
ProgramDataBaseFileName=".\debug/" ProgramDataBaseFileName=".\debug_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1" DebugInformationFormat="1"
...@@ -162,7 +102,7 @@ ...@@ -162,7 +102,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib" AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_debug/mysqladmin.exe" OutputFile=".\debug/mysqladmin.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
...@@ -172,7 +112,7 @@ ...@@ -172,7 +112,7 @@
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TypeLibraryName=".\debug/mysqladmin.tlb" TypeLibraryName=".\debug_obj/mysqladmin.tlb"
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool"/> Name="VCPostBuildEventTool"/>
...@@ -201,30 +141,6 @@ ...@@ -201,30 +141,6 @@
<Files> <Files>
<File <File
RelativePath="mysqladmin.cpp"> RelativePath="mysqladmin.cpp">
<FileConfiguration
Name="classic|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File> </File>
</Files> </Files>
<Globals> <Globals>
......
VC++Files/client/mysqlclient.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/client/mysqldump.vcproj
View file @ adf4f635
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory=".\debug" OutputDirectory=".\debug_obj"
IntermediateDirectory=".\debug" IntermediateDirectory=".\debug_obj"
ConfigurationType="1" ConfigurationType="1"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE" ATLMinimizesCRunTimeLibraryUsage="FALSE"
...@@ -24,11 +24,12 @@ ...@@ -24,11 +24,12 @@
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../" AdditionalIncludeDirectories="../include,../"
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS" PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
PrecompiledHeaderFile=".\debug/mysqldump.pch" PrecompiledHeaderFile=".\debug_obj/mysqldump.pch"
AssemblerListingLocation=".\debug/" AssemblerListingLocation=".\debug_obj/"
ObjectFile=".\debug/" ObjectFile=".\debug_obj/"
ProgramDataBaseFileName=".\debug/" ProgramDataBaseFileName=".\debug_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1" DebugInformationFormat="1"
...@@ -38,17 +39,17 @@ ...@@ -38,17 +39,17 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib" AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_debug/mysqldump.exe" OutputFile=".\debug/mysqldump.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=".\debug"
GenerateDebugInformation="TRUE" GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\debug/mysqldump.pdb" ProgramDatabaseFile=".\debug/mysqldump.pdb"
SubSystem="1" SubSystem="1"
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TypeLibraryName=".\debug/mysqldump.tlb" TypeLibraryName=".\debug_obj/mysqldump.tlb"
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool"/> Name="VCPostBuildEventTool"/>
...@@ -73,8 +74,8 @@ ...@@ -73,8 +74,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory=".\release" OutputDirectory=".\release_obj"
IntermediateDirectory=".\release" IntermediateDirectory=".\release_obj"
ConfigurationType="1" ConfigurationType="1"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE" ATLMinimizesCRunTimeLibraryUsage="FALSE"
...@@ -85,94 +86,33 @@ ...@@ -85,94 +86,33 @@
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../" AdditionalIncludeDirectories="../include,../"
PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG" PreprocessorDefinitions="DBUG_OFF;NDEBUG;_CONSOLE;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\release/mysqldump.pch" PrecompiledHeaderFile=".\release_obj/mysqldump.pch"
AssemblerListingLocation=".\release/" AssemblerListingLocation=".\release_obj/"
ObjectFile=".\release/" ObjectFile=".\release_obj/"
ProgramDataBaseFileName=".\release/" ProgramDataBaseFileName=".\release_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1"
CompileAs="0"/> CompileAs="0"/>
<Tool <Tool
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib" AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_release/mysqldump.exe" OutputFile=".\release/mysqldump.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=".\release"
ProgramDatabaseFile=".\release/mysqldump.pdb" ProgramDatabaseFile=".\release/mysqldump.pdb"
SubSystem="1" SubSystem="1"
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TypeLibraryName=".\release/mysqldump.tlb" TypeLibraryName=".\release_obj/mysqldump.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="classic|Win32"
OutputDirectory=".\classic"
IntermediateDirectory=".\classic"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../"
PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\classic/mysqldump.pch"
AssemblerListingLocation=".\classic/"
ObjectFile=".\classic/"
ProgramDataBaseFileName=".\classic/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_classic/mysqldump.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
ProgramDatabaseFile=".\classic/mysqldump.pdb"
SubSystem="1"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\classic/mysqldump.tlb"
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool"/> Name="VCPostBuildEventTool"/>
...@@ -200,58 +140,10 @@ ...@@ -200,58 +140,10 @@
</References> </References>
<Files> <Files>
<File <File
RelativePath="mysqldump.c"> RelativePath="my_user.c">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="classic|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="my_user.c"> RelativePath="mysqldump.c">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="classic|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File> </File>
</Files> </Files>
<Globals> <Globals>
......
VC++Files/client/mysqlimport.vcproj
View file @ adf4f635
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory=".\debug" OutputDirectory=".\debug_obj"
IntermediateDirectory=".\debug" IntermediateDirectory=".\debug_obj"
ConfigurationType="1" ConfigurationType="1"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE" ATLMinimizesCRunTimeLibraryUsage="FALSE"
...@@ -24,11 +24,12 @@ ...@@ -24,11 +24,12 @@
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../" AdditionalIncludeDirectories="../include,../"
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS" PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
PrecompiledHeaderFile=".\debug/mysqlimport.pch" PrecompiledHeaderFile=".\debug_obj/mysqlimport.pch"
AssemblerListingLocation=".\debug/" AssemblerListingLocation=".\debug_obj/"
ObjectFile=".\debug/" ObjectFile=".\debug_obj/"
ProgramDataBaseFileName=".\debug/" ProgramDataBaseFileName=".\debug_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1" DebugInformationFormat="1"
...@@ -38,7 +39,7 @@ ...@@ -38,7 +39,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib setargv.obj" AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib setargv.obj"
OutputFile="../client_debug/mysqlimport.exe" OutputFile=".\debug/mysqlimport.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
...@@ -48,7 +49,7 @@ ...@@ -48,7 +49,7 @@
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TypeLibraryName=".\debug/mysqlimport.tlb" TypeLibraryName=".\debug_obj/mysqlimport.tlb"
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool"/> Name="VCPostBuildEventTool"/>
...@@ -73,8 +74,8 @@ ...@@ -73,8 +74,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory=".\release" OutputDirectory=".\release_obj"
IntermediateDirectory=".\release" IntermediateDirectory=".\release_obj"
ConfigurationType="1" ConfigurationType="1"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE" ATLMinimizesCRunTimeLibraryUsage="FALSE"
...@@ -85,23 +86,24 @@ ...@@ -85,23 +86,24 @@
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../" AdditionalIncludeDirectories="../include,../"
PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG" PreprocessorDefinitions="DBUG_OFF;NDEBUG;_CONSOLE;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\release/mysqlimport.pch" PrecompiledHeaderFile=".\release_obj/mysqlimport.pch"
AssemblerListingLocation=".\release/" AssemblerListingLocation=".\release_obj/"
ObjectFile=".\release/" ObjectFile=".\release_obj/"
ProgramDataBaseFileName=".\release/" ProgramDataBaseFileName=".\release_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1"
CompileAs="0"/> CompileAs="0"/>
<Tool <Tool
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib" AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_release/mysqlimport.exe" OutputFile=".\release/mysqlimport.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
...@@ -110,69 +112,7 @@ ...@@ -110,69 +112,7 @@
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TypeLibraryName=".\release/mysqlimport.tlb" TypeLibraryName=".\release_obj/mysqlimport.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="classic|Win32"
OutputDirectory=".\classic"
IntermediateDirectory=".\classic"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../"
PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\classic/mysqlimport.pch"
AssemblerListingLocation=".\classic/"
ObjectFile=".\classic/"
ProgramDataBaseFileName=".\classic/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_classic/mysqlimport.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
ProgramDatabaseFile=".\classic/mysqlimport.pdb"
SubSystem="1"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\classic/mysqlimport.tlb"
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool"/> Name="VCPostBuildEventTool"/>
...@@ -201,30 +141,6 @@ ...@@ -201,30 +141,6 @@
<Files> <Files>
<File <File
RelativePath="mysqlimport.c"> RelativePath="mysqlimport.c">
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="classic|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File> </File>
</Files> </Files>
<Globals> <Globals>
......
VC++Files/client/mysqlshow.vcproj
View file @ adf4f635
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory=".\release" OutputDirectory=".\release_obj"
IntermediateDirectory=".\release" IntermediateDirectory=".\release_obj"
ConfigurationType="1" ConfigurationType="1"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE" ATLMinimizesCRunTimeLibraryUsage="FALSE"
...@@ -24,23 +24,24 @@ ...@@ -24,23 +24,24 @@
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../" AdditionalIncludeDirectories="../include,../"
PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG" PreprocessorDefinitions="DBUG_OFF;NDEBUG;_CONSOLE;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\release/mysqlshow.pch" PrecompiledHeaderFile=".\release_obj/mysqlshow.pch"
AssemblerListingLocation=".\release/" AssemblerListingLocation=".\release_obj/"
ObjectFile=".\release/" ObjectFile=".\release_obj/"
ProgramDataBaseFileName=".\release/" ProgramDataBaseFileName=".\release_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1"
CompileAs="0"/> CompileAs="0"/>
<Tool <Tool
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib" AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_release/mysqlshow.exe" OutputFile=".\release/mysqlshow.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
...@@ -49,69 +50,7 @@ ...@@ -49,69 +50,7 @@
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TypeLibraryName=".\release/mysqlshow.tlb" TypeLibraryName=".\release_obj/mysqlshow.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="classic|Win32"
OutputDirectory=".\classic"
IntermediateDirectory=".\classic"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../"
PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\classic/mysqlshow.pch"
AssemblerListingLocation=".\classic/"
ObjectFile=".\classic/"
ProgramDataBaseFileName=".\classic/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_classic/mysqlshow.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
ProgramDatabaseFile=".\classic/mysqlshow.pdb"
SubSystem="1"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\classic/mysqlshow.tlb"
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool"/> Name="VCPostBuildEventTool"/>
...@@ -136,8 +75,8 @@ ...@@ -136,8 +75,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory=".\debug" OutputDirectory=".\debug_obj"
IntermediateDirectory=".\debug" IntermediateDirectory=".\debug_obj"
ConfigurationType="1" ConfigurationType="1"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE" ATLMinimizesCRunTimeLibraryUsage="FALSE"
...@@ -148,11 +87,12 @@ ...@@ -148,11 +87,12 @@
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include,../" AdditionalIncludeDirectories="../include,../"
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS" PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
PrecompiledHeaderFile=".\debug/mysqlshow.pch" PrecompiledHeaderFile=".\debug_obj/mysqlshow.pch"
AssemblerListingLocation=".\debug/" AssemblerListingLocation=".\debug_obj/"
ObjectFile=".\debug/" ObjectFile=".\debug_obj/"
ProgramDataBaseFileName=".\debug/" ProgramDataBaseFileName=".\debug_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1" DebugInformationFormat="1"
...@@ -162,7 +102,7 @@ ...@@ -162,7 +102,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib" AdditionalDependencies="wsock32.lib odbc32.lib odbccp32.lib"
OutputFile="../client_debug/mysqlshow.exe" OutputFile=".\debug/mysqlshow.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
...@@ -172,7 +112,7 @@ ...@@ -172,7 +112,7 @@
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TypeLibraryName=".\debug/mysqlshow.tlb" TypeLibraryName=".\debug_obj/mysqlshow.tlb"
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool"/> Name="VCPostBuildEventTool"/>
...@@ -201,30 +141,6 @@ ...@@ -201,30 +141,6 @@
<Files> <Files>
<File <File
RelativePath="mysqlshow.c"> RelativePath="mysqlshow.c">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="classic|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File> </File>
</Files> </Files>
<Globals> <Globals>
......
VC++Files/client/mysqltest.vcproj
View file @ adf4f635
...@@ -12,35 +12,36 @@ ...@@ -12,35 +12,36 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory=".\release" OutputDirectory=".\release_obj"
IntermediateDirectory=".\release" IntermediateDirectory=".\release_obj"
ConfigurationType="1" ConfigurationType="1"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE" ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="4" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../extra,../include,../regex,../extra/yassl/include,../" AdditionalIncludeDirectories="../extra,../include,../regex,../extra/yassl/include,../"
PreprocessorDefinitions="DBUG_OFF;_CONSOLE;_WINDOWS;NDEBUG" PreprocessorDefinitions="DBUG_OFF;NDEBUG;_CONSOLE;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\release/mysqltest.pch" PrecompiledHeaderFile=".\release_obj/mysqltest.pch"
AssemblerListingLocation=".\release/" AssemblerListingLocation=".\release_obj/"
ObjectFile=".\release/" ObjectFile=".\release_obj/"
ProgramDataBaseFileName=".\release/" ProgramDataBaseFileName=".\release_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1"
CompileAs="0"/> CompileAs="0"/>
<Tool <Tool
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib" AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
OutputFile="..\client_release\mysqltest.exe" OutputFile=".\release/mysqltest.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
...@@ -51,71 +52,7 @@ ...@@ -51,71 +52,7 @@
Name="VCMIDLTool" Name="VCMIDLTool"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName=".\release/mysqltest.tlb" TypeLibraryName=".\release_obj/mysqltest.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1033"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration
Name="classic|Win32"
OutputDirectory=".\classic"
IntermediateDirectory=".\classic"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="4"
InlineFunctionExpansion="1"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="../extra,../include,../regex,../extra/yassl/include,../"
PreprocessorDefinitions="_CONSOLE;_WINDOWS;LICENSE=Commercial;DBUG_OFF;NDEBUG"
StringPooling="TRUE"
RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE"
PrecompiledHeaderFile=".\classic/mysqltest.pch"
AssemblerListingLocation=".\classic/"
ObjectFile=".\classic/"
ProgramDataBaseFileName=".\classic/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
OutputFile="..\client_classic\mysqltest.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories=""
ProgramDatabaseFile=".\classic/mysqltest.pdb"
SubSystem="1"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
SuppressStartupBanner="TRUE"
TargetEnvironment="1"
TypeLibraryName=".\classic/mysqltest.tlb"
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool"/> Name="VCPostBuildEventTool"/>
...@@ -140,8 +77,8 @@ ...@@ -140,8 +77,8 @@
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|Win32" Name="Debug|Win32"
OutputDirectory=".\debug" OutputDirectory=".\debug_obj"
IntermediateDirectory=".\debug" IntermediateDirectory=".\debug_obj"
ConfigurationType="1" ConfigurationType="1"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE" ATLMinimizesCRunTimeLibraryUsage="FALSE"
...@@ -154,10 +91,10 @@ ...@@ -154,10 +91,10 @@
PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS" PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_CONSOLE;_WINDOWS"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
PrecompiledHeaderFile=".\debug/mysqltest.pch" PrecompiledHeaderFile=".\debug_obj/mysqltest.pch"
AssemblerListingLocation=".\debug/" AssemblerListingLocation=".\debug_obj/"
ObjectFile=".\debug/" ObjectFile=".\debug_obj/"
ProgramDataBaseFileName=".\debug/" ProgramDataBaseFileName=".\debug_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1" DebugInformationFormat="1"
...@@ -167,7 +104,7 @@ ...@@ -167,7 +104,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib" AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
OutputFile="..\client_debug\mysqltest.exe" OutputFile=".\debug/mysqltest.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
AdditionalLibraryDirectories="" AdditionalLibraryDirectories=""
...@@ -179,7 +116,7 @@ ...@@ -179,7 +116,7 @@
Name="VCMIDLTool" Name="VCMIDLTool"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
TargetEnvironment="1" TargetEnvironment="1"
TypeLibraryName=".\debug/mysqltest.tlb" TypeLibraryName=".\debug_obj/mysqltest.tlb"
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool"/> Name="VCPostBuildEventTool"/>
...@@ -208,55 +145,9 @@ ...@@ -208,55 +145,9 @@
<Files> <Files>
<File <File
RelativePath="..\libmysql\manager.c"> RelativePath="..\libmysql\manager.c">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="classic|Win32">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="mysqltest.c"> RelativePath="mysqltest.c">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="classic|Win32">
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""
BasicRuntimeChecks="3"/>
</FileConfiguration>
</File> </File>
</Files> </Files>
<Globals> <Globals>
......
VC++Files/comp_err/comp_err.vcproj
View file @ adf4f635
...@@ -10,10 +10,73 @@ ...@@ -10,10 +10,73 @@
Name="Win32"/> Name="Win32"/>
</Platforms> </Platforms>
<Configurations> <Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory=".\debug_obj"
IntermediateDirectory=".\debug_obj"
ConfigurationType="1"
UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include"
PreprocessorDefinitions="_DEBUG;WIN32;_CONSOLE;_WINDOWS;__WIN__;_MT"
StringPooling="TRUE"
RuntimeLibrary="1"
UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\debug_obj/comp_err.pch"
AssemblerListingLocation=".\debug_obj/"
ObjectFile=".\debug_obj/"
ProgramDataBaseFileName=".\debug_obj/"
WarningLevel="3"
SuppressStartupBanner="TRUE"
DebugInformationFormat="1"
CompileAs="0"/>
<Tool
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
OutputFile="../extra/debug/comp_err.exe"
LinkIncremental="1"
SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="LIBCD.lib"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="../extra/debug/comp_err.pdb"
SubSystem="1"
TargetMachine="1"/>
<Tool
Name="VCMIDLTool"
TypeLibraryName=".\debug_obj/comp_err.tlb"
HeaderFileName=""/>
<Tool
Name="VCPostBuildEventTool"/>
<Tool
Name="VCPreBuildEventTool"/>
<Tool
Name="VCPreLinkEventTool"/>
<Tool
Name="VCResourceCompilerTool"
PreprocessorDefinitions="NDEBUG"
Culture="1046"/>
<Tool
Name="VCWebServiceProxyGeneratorTool"/>
<Tool
Name="VCXMLDataGeneratorTool"/>
<Tool
Name="VCWebDeploymentTool"/>
<Tool
Name="VCManagedWrapperGeneratorTool"/>
<Tool
Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Release|Win32"
OutputDirectory=".\release" OutputDirectory=".\release_obj"
IntermediateDirectory=".\release" IntermediateDirectory=".\release_obj"
ConfigurationType="1" ConfigurationType="1"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
...@@ -25,13 +88,13 @@ ...@@ -25,13 +88,13 @@
AdditionalIncludeDirectories="..\include" AdditionalIncludeDirectories="..\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_MBCSN;DBUG_OFF;_WINDOWS;__WIN__;_MT" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_MBCSN;DBUG_OFF;_WINDOWS;__WIN__;_MT"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="4" RuntimeLibrary="0"
EnableFunctionLevelLinking="TRUE" EnableFunctionLevelLinking="TRUE"
UsePrecompiledHeader="2" UsePrecompiledHeader="2"
PrecompiledHeaderFile=".\release/comp_err.pch" PrecompiledHeaderFile=".\release_obj/comp_err.pch"
AssemblerListingLocation=".\release/" AssemblerListingLocation=".\release_obj/"
ObjectFile=".\release/" ObjectFile=".\release_obj/"
ProgramDataBaseFileName=".\release/" ProgramDataBaseFileName=".\release_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
CompileAs="0"/> CompileAs="0"/>
...@@ -40,16 +103,16 @@ ...@@ -40,16 +103,16 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib" AdditionalDependencies="odbc32.lib odbccp32.lib wsock32.lib"
OutputFile="../client_release/comp-err.exe" OutputFile="../extra/release/comp_err.exe"
LinkIncremental="1" LinkIncremental="1"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
IgnoreDefaultLibraryNames="LIBC.lib" IgnoreDefaultLibraryNames="LIBC.lib"
ProgramDatabaseFile=".\release/comp-err.pdb" ProgramDatabaseFile="../extra/release/comp_err.pdb"
SubSystem="1" SubSystem="1"
TargetMachine="1"/> TargetMachine="1"/>
<Tool <Tool
Name="VCMIDLTool" Name="VCMIDLTool"
TypeLibraryName=".\release/comp_err.tlb" TypeLibraryName=".\release_obj/comp_err.tlb"
HeaderFileName=""/> HeaderFileName=""/>
<Tool <Tool
Name="VCPostBuildEventTool"/> Name="VCPostBuildEventTool"/>
...@@ -78,14 +141,6 @@ ...@@ -78,14 +141,6 @@
<Files> <Files>
<File <File
RelativePath="..\extra\comp_err.c"> RelativePath="..\extra\comp_err.c">
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File> </File>
</Files> </Files>
<Globals> <Globals>
......
VC++Files/dbug/dbug.vcproj
View file @ adf4f635
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
<Configurations> <Configurations>
<Configuration <Configuration
Name="TLS_DEBUG|Win32" Name="TLS_DEBUG|Win32"
OutputDirectory=".\dbug___Win32_TLS_DEBUG" OutputDirectory=".\TLS_DEBUG"
IntermediateDirectory=".\dbug___Win32_TLS_DEBUG" IntermediateDirectory=".\TLS_DEBUG"
ConfigurationType="4" ConfigurationType="4"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
...@@ -22,13 +22,13 @@ ...@@ -22,13 +22,13 @@
Optimization="0" Optimization="0"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include" AdditionalIncludeDirectories="../include"
PreprocessorDefinitions="__WIN32__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_TLS" PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;__WIN32__;_WINDOWS;USE_TLS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="1" RuntimeLibrary="1"
PrecompiledHeaderFile=".\dbug___Win32_TLS_DEBUG/dbug.pch" PrecompiledHeaderFile=".\TLS_DEBUG/dbug.pch"
AssemblerListingLocation=".\dbug___Win32_TLS_DEBUG/" AssemblerListingLocation=".\TLS_DEBUG/"
ObjectFile=".\dbug___Win32_TLS_DEBUG/" ObjectFile=".\TLS_DEBUG/"
ProgramDataBaseFileName=".\dbug___Win32_TLS_DEBUG/" ProgramDataBaseFileName=".\TLS_DEBUG/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1" DebugInformationFormat="1"
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\lib_debug\dbug_tls.lib" OutputFile=".\debug_obj\dbug_tls.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
...@@ -60,34 +60,33 @@ ...@@ -60,34 +60,33 @@
Name="VCAuxiliaryManagedWrapperGeneratorTool"/> Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration> </Configuration>
<Configuration <Configuration
Name="Release|Win32" Name="Debug|Win32"
OutputDirectory=".\release" OutputDirectory=".\debug_obj"
IntermediateDirectory=".\release" IntermediateDirectory=".\debug_obj"
ConfigurationType="4" ConfigurationType="4"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="2" Optimization="0"
InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include" AdditionalIncludeDirectories="../include"
PreprocessorDefinitions="DBUG_OFF;_WINDOWS;NDEBUG" PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;__WIN32__;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="0" RuntimeLibrary="1"
EnableFunctionLevelLinking="TRUE" PrecompiledHeaderFile=".\debug_obj/dbug.pch"
PrecompiledHeaderFile=".\release/dbug.pch" AssemblerListingLocation=".\debug_obj/"
AssemblerListingLocation=".\release/" ObjectFile=".\debug_obj/"
ObjectFile=".\release/" ProgramDataBaseFileName=".\debug_obj/"
ProgramDataBaseFileName=".\release/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1"
CompileAs="0"/> CompileAs="0"/>
<Tool <Tool
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\lib_release\dbug.lib" OutputFile=".\debug_obj\dbug.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
...@@ -110,24 +109,25 @@ ...@@ -110,24 +109,25 @@
Name="VCAuxiliaryManagedWrapperGeneratorTool"/> Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
</Configuration> </Configuration>
<Configuration <Configuration
Name="Debug|Win32" Name="Release|Win32"
OutputDirectory=".\debug" OutputDirectory=".\release_obj"
IntermediateDirectory=".\debug" IntermediateDirectory=".\release_obj"
ConfigurationType="4" ConfigurationType="4"
UseOfMFC="0" UseOfMFC="0"
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
Optimization="0" Optimization="2"
InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
AdditionalIncludeDirectories="../include" AdditionalIncludeDirectories="../include"
PreprocessorDefinitions="__WIN32__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS" PreprocessorDefinitions="DBUG_OFF;NDEBUG;__WIN32__;_WINDOWS"
StringPooling="TRUE" StringPooling="TRUE"
RuntimeLibrary="1" RuntimeLibrary="0"
PrecompiledHeaderFile=".\debug/dbug.pch" PrecompiledHeaderFile=".\release_obj/dbug.pch"
AssemblerListingLocation=".\debug/" AssemblerListingLocation=".\release_obj/"
ObjectFile=".\debug/" ObjectFile=".\release_obj/"
ProgramDataBaseFileName=".\debug/" ProgramDataBaseFileName=".\release_obj/"
WarningLevel="3" WarningLevel="3"
SuppressStartupBanner="TRUE" SuppressStartupBanner="TRUE"
DebugInformationFormat="1" DebugInformationFormat="1"
...@@ -136,7 +136,7 @@ ...@@ -136,7 +136,7 @@
Name="VCCustomBuildTool"/> Name="VCCustomBuildTool"/>
<Tool <Tool
Name="VCLibrarianTool" Name="VCLibrarianTool"
OutputFile="..\lib_debug\dbug.lib" OutputFile=".\release_obj\dbug.lib"
SuppressStartupBanner="TRUE"/> SuppressStartupBanner="TRUE"/>
<Tool <Tool
Name="VCMIDLTool"/> Name="VCMIDLTool"/>
...@@ -164,84 +164,12 @@ ...@@ -164,84 +164,12 @@
<Files> <Files>
<File <File
RelativePath="dbug.c"> RelativePath="dbug.c">
<FileConfiguration
Name="TLS_DEBUG|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="factorial.c"> RelativePath="factorial.c">
<FileConfiguration
Name="TLS_DEBUG|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File> </File>
<File <File
RelativePath="sanity.c"> RelativePath="sanity.c">
<FileConfiguration
Name="TLS_DEBUG|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Release|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories=""
PreprocessorDefinitions=""/>
</FileConfiguration>
</File> </File>
</Files> </Files>
<Globals> <Globals>
......
VC++Files/heap/heap.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/innobase/innobase.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/libmysql/libmysql.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/libmysqld/libmysqld.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/libmysqltest/myTest.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/myisam/myisam.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/myisamchk/myisamchk.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/myisamlog/myisamlog.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/myisammrg/myisammrg.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/myisampack/myisampack.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/mysql.sln
View file @ adf4f635
This diff is collapsed.
VC++Files/mysqlbinlog/mysqlbinlog.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/mysqlcheck/mysqlcheck.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/mysqldemb/mysqldemb.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/mysqlserver/mysqlserver.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/mysys/mysys.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/perror/perror.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/regex/regex.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/replace/replace.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/sql/gen_lex_hash.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/sql/mysqld.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/strings/strings.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/test1/test1.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/tests/mysql_client_test.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/thr_test/thr_test.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/vio/vio.vcproj
View file @ adf4f635
This diff is collapsed.
VC++Files/zlib/zlib.vcproj
View file @ adf4f635
This diff is collapsed.
extra/yassl/taocrypt/taocrypt.vcproj
View file @ adf4f635
This diff is collapsed.
extra/yassl/yassl.vcproj
View file @ adf4f635
This diff is collapsed.
mysql-test/install_test_db.sh
View file @ adf4f635
...@@ -22,7 +22,7 @@ if [ x$1 = x"--bin" ]; then ...@@ -22,7 +22,7 @@ if [ x$1 = x"--bin" ]; then
BINARY_DIST=1 BINARY_DIST=1
bindir=../bin bindir=../bin
scriptdir=../bin scriptdir=bin
libexecdir=../libexec libexecdir=../libexec
# Check if it's a binary distribution or a 'make install' # Check if it's a binary distribution or a 'make install'
...@@ -33,7 +33,7 @@ if [ x$1 = x"--bin" ]; then ...@@ -33,7 +33,7 @@ if [ x$1 = x"--bin" ]; then
then then
execdir=../../sbin execdir=../../sbin
bindir=../../bin bindir=../../bin
scriptdir=../../bin scriptdir=../bin
libexecdir=../../libexec libexecdir=../../libexec
else else
execdir=../bin execdir=../bin
...@@ -43,7 +43,7 @@ else ...@@ -43,7 +43,7 @@ else
execdir=../sql execdir=../sql
bindir=../client bindir=../client
fix_bin=. fix_bin=.
scriptdir=../scripts scriptdir=scripts
libexecdir=../libexec libexecdir=../libexec
fi fi
...@@ -100,18 +100,14 @@ if [ x$BINARY_DIST = x1 ] ; then ...@@ -100,18 +100,14 @@ if [ x$BINARY_DIST = x1 ] ; then
basedir=.. basedir=..
else else
basedir=. basedir=.
EXTRA_ARG="--language=../sql/share/english/ --character-sets-dir=../sql/share/charsets/" EXTRA_ARG="--windows"
fi fi
mysqld_boot="${MYSQLD_BOOTSTRAP-$mysqld}" INSTALL_CMD="$scriptdir/mysql_install_db --no-defaults $EXTRA_ARG --basedir=$basedir --datadir=mysql-test/$ldata --srcdir=."
echo "running $INSTALL_CMD"
mysqld_boot="$mysqld_boot --no-defaults --bootstrap --skip-grant-tables \ cd ..
--basedir=$basedir --datadir=$ldata \ if $INSTALL_CMD
--skip-innodb --skip-ndbcluster --skip-bdb \
$EXTRA_ARG"
echo "running $mysqld_boot"
if $scriptdir/mysql_create_system_tables test $mdata $hostname | $mysqld_boot
then then
exit 0 exit 0
else else
......
mysql-test/mysql-test-run.pl
View file @ adf4f635
...@@ -1495,9 +1495,17 @@ sub executable_setup () { ...@@ -1495,9 +1495,17 @@ sub executable_setup () {
if (!$opt_extern) if (!$opt_extern)
{ {
# Look for SQL scripts directory # Look for SQL scripts directory
$path_sql_dir= mtr_path_exists("$glob_basedir/share", if ( mtr_file_exists("$path_share/mysql_system_tables.sql") ne "")
"$glob_basedir/scripts"); {
# The SQL scripts are in path_share
$path_sql_dir= $path_share;
}
else
{
$path_sql_dir= mtr_path_exists("$glob_basedir/share",
"$glob_basedir/scripts");
}
if ( $mysql_version_id >= 50100 ) { if ( $mysql_version_id >= 50100 ) {
$exe_mysqlslap= mtr_exe_exists("$path_client_bindir/mysqlslap"); $exe_mysqlslap= mtr_exe_exists("$path_client_bindir/mysqlslap");
......
mysql-test/r/loaddata.result
View file @ adf4f635
This diff is collapsed.
mysql-test/t/loaddata.test
View file @ adf4f635
This diff is collapsed.
ndb/src/cw/cpcc-win32/C++/CPC_GUI.vcproj
View file @ adf4f635
This diff is collapsed.
netware/Makefile.am
View file @ adf4f635
This diff is collapsed.
netware/init_db.sql deleted 100644 → 0
View file @ a936a944
This diff is collapsed.
netware/test_db.sql deleted 100644 → 0
View file @ a936a944
This diff is collapsed.
scripts/make_binary_distribution.sh
View file @ adf4f635
This diff is collapsed.
scripts/make_win_bin_dist
View file @ adf4f635
This diff is collapsed.
sql/item_cmpfunc.cc
View file @ adf4f635
This diff is collapsed.
sql/mysql_priv.h
View file @ adf4f635
This diff is collapsed.
sql/sql_acl.h
View file @ adf4f635
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7