database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build

Browse Source 
into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
This commit is contained in:
kent@kent-amd64.(none)
2007-03-20 17:58:30 +01:00
parent a947708760 aab816e779
commit a149769b2d
21 changed files with 143 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server-tools/instance-manager/mysqlmanager.vcproj
View File

@ -12,13 +12,14 @@
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="../../client_debug"
IntermediateDirectory="Debug"
OutputDirectory=".\debug_obj"
IntermediateDirectory=".\debug_obj"
ConfigurationType="1"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="0"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="..\..\include,../../extra/yassl/include"
PreprocessorDefinitions="MYSQL_INSTANCE_MANAGER;MYSQL_SERVER;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;CONSOLE"
MinimalRebuild="TRUE"
@ -34,10 +35,12 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib"
OutputFile="../../client_debug/mysqlmanager.exe"
LinkIncremental="2"
OutputFile=".\debug/mysqlmanager.exe"
LinkIncremental="1"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile="../../client_debug/mysqlmanager.pdb"
ProgramDatabaseFile=".\debug/mysqlmanager.pdb"
GenerateMapFile="TRUE"
MapFileName=".\debug/mysqlmanager.map"
SubSystem="1"
TargetMachine="1"/>
<Tool
@ -63,12 +66,15 @@
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="../../client_release"
IntermediateDirectory="Release"
OutputDirectory=".\release_obj"
IntermediateDirectory=".\release_obj"
ConfigurationType="1"
CharacterSet="2">
<Tool
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
OptimizeForProcessor="2"
AdditionalIncludeDirectories="..\..\include,../../extra/yassl/include"
PreprocessorDefinitions="MYSQL_INSTANCE_MANAGER;MYSQL_SERVER;_WINDOWS;CONSOLE"
ExceptionHandling="FALSE"
@ -82,9 +88,12 @@
<Tool
Name="VCLinkerTool"
AdditionalDependencies="wsock32.lib"
OutputFile="../../client_release/mysqlmanager.exe"
OutputFile=".\release/mysqlmanager.exe"
LinkIncremental="1"
GenerateDebugInformation="TRUE"
ProgramDatabaseFile=".\release/mysqlmanager.pdb"
GenerateMapFile="TRUE"
MapFileName=".\release/mysqlmanager.map"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"