diff options
| author | unknown <kroki/tomash@moonlight.intranet> | 2006-07-27 13:47:36 +0400 |
|---|---|---|
| committer | unknown <kroki/tomash@moonlight.intranet> | 2006-07-27 13:47:36 +0400 |
| commit | a6557b0c94ee54557aa8fe0a5c4808de992a9c5a (patch) | |
| tree | abea0142dd8f7e30a7e18efe106b7e5cc7a1de4e /VC++Files | |
| parent | 39486004bbf13987b5962056bf0bf0ed4bf7b86d (diff) | |
| parent | b0b0c8cc1f6273ee7b4105a838572f079873f53c (diff) | |
| download | mariadb-git-a6557b0c94ee54557aa8fe0a5c4808de992a9c5a.tar.gz | |
Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-release
into moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-main
VC++Files/sql/mysqld.vcproj:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/warnings.result:
Auto merged
mysql-test/t/warnings-master.opt:
Auto merged
mysql-test/t/warnings.test:
Auto merged
sql/handler.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/set_var.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'VC++Files')
| -rw-r--r-- | VC++Files/mysys/mysys.vcproj | 2 | ||||
| -rw-r--r-- | VC++Files/sql/mysqld.vcproj | 42 |
2 files changed, 34 insertions, 10 deletions
diff --git a/VC++Files/mysys/mysys.vcproj b/VC++Files/mysys/mysys.vcproj index 3885e18cea8..3f2c5e755ac 100644 --- a/VC++Files/mysys/mysys.vcproj +++ b/VC++Files/mysys/mysys.vcproj @@ -22,7 +22,7 @@ Optimization="0" OptimizeForProcessor="2" AdditionalIncludeDirectories="../include,../zlib" - PreprocessorDefinitions="__NT__;_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_SYMDIR" + PreprocessorDefinitions="_DEBUG;SAFEMALLOC;SAFE_MUTEX;_WINDOWS;USE_SYMDIR" RuntimeLibrary="1" PrecompiledHeaderFile=".\debug/mysys.pch" AssemblerListingLocation=".\debug/" diff --git a/VC++Files/sql/mysqld.vcproj b/VC++Files/sql/mysqld.vcproj index 5e1f5014753..e18a6364c8b 100644 --- a/VC++Files/sql/mysqld.vcproj +++ b/VC++Files/sql/mysqld.vcproj @@ -43,7 +43,10 @@ OutputFile="../client_classic/mysqld-nt.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="../client_classic/mysqld-nt.pdb" + GenerateMapFile="TRUE" + MapFileName="../client_classic/mysqld-nt.map" SubSystem="1" TargetMachine="1"/> <Tool @@ -104,6 +107,10 @@ OutputFile="../client_release/mysqld-max.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="../client_release/mysqld-max.pdb" + GenerateMapFile="TRUE" + MapFileName="../client_release/mysqld-max.map" SubSystem="1" TargetMachine="1"/> <Tool @@ -164,9 +171,10 @@ OutputFile="../client_release/mysqld-max-nt.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\max_nt/mysqld-max-nt.pdb" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="../client_release/mysqld-max-nt.pdb" GenerateMapFile="TRUE" - MapFileName=".\max_nt/mysqld-max-nt.map" + MapFileName="../client_release/mysqld-max-nt.map" SubSystem="1" TargetMachine="1"/> <Tool @@ -227,9 +235,10 @@ OutputFile="../client_release/mysqld-nt.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - ProgramDatabaseFile=".\nt/mysqld-nt.pdb" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="../client_release/mysqld-nt.pdb" GenerateMapFile="TRUE" - MapFileName=".\nt/mysqld-nt.map" + MapFileName="../client_release/mysqld-nt.map" SubSystem="1" TargetMachine="1"/> <Tool @@ -290,7 +299,10 @@ OutputFile="../client_pro/mysqld-nt.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="../client_pro/mysqld-nt.pdb" + GenerateMapFile="TRUE" + MapFileName="../client_pro/mysqld-nt.map" SubSystem="1" TargetMachine="1"/> <Tool @@ -350,7 +362,9 @@ LinkIncremental="1" SuppressStartupBanner="TRUE" GenerateDebugInformation="TRUE" - ProgramDatabaseFile=".\debug/mysqld-debug.pdb" + ProgramDatabaseFile="../client_debug/mysqld-debug.pdb" + GenerateMapFile="TRUE" + MapFileName="../client_debug/mysqld-debug.map" SubSystem="1" TargetMachine="1"/> <Tool @@ -411,7 +425,10 @@ OutputFile="../client_pro/mysqld.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="../client_pro/mysqld.pdb" + GenerateMapFile="TRUE" + MapFileName="../client_pro/mysqld.map" SubSystem="1" TargetMachine="1"/> <Tool @@ -472,7 +489,10 @@ OutputFile="../client_classic/mysqld.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" - AdditionalLibraryDirectories="" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="../client_classic/mysqld.pdb" + GenerateMapFile="TRUE" + MapFileName="../client_classic/mysqld.map" SubSystem="1" TargetMachine="1"/> <Tool @@ -533,6 +553,10 @@ OutputFile="../client_release/mysqld.exe" LinkIncremental="1" SuppressStartupBanner="TRUE" + GenerateDebugInformation="TRUE" + ProgramDatabaseFile="../client_release/mysqld.pdb" + GenerateMapFile="TRUE" + MapFileName="../client_release/mysqld.map" SubSystem="1" TargetMachine="1"/> <Tool |