Skip to content

M
mariadb
Commit 2cbc50c5 authored by kent@mysql.com's avatar kent@mysql.com
Browse files
Options

Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new 

into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
parents 0edf42a9 9b40dabd
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 13 deletions
VC++Files/bdb/bdb.vcproj
View file @ 2cbc50c5
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
......
VC++Files/innobase/innobase.vcproj
View file @ 2cbc50c5
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt-max"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
...@@ -175,7 +174,6 @@ ...@@ -175,7 +174,6 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
......
VC++Files/libmysqld/libmysqld.vcproj
View file @ 2cbc50c5
...@@ -86,7 +86,6 @@ ...@@ -86,7 +86,6 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
......
VC++Files/mysqldemb/mysqldemb.vcproj
View file @ 2cbc50c5
...@@ -71,7 +71,6 @@ ...@@ -71,7 +71,6 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib" AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib"
......
VC++Files/mysys/mysys.vcproj
View file @ 2cbc50c5
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
ATLMinimizesCRunTimeLibraryUsage="FALSE"> ATLMinimizesCRunTimeLibraryUsage="FALSE">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
......
VC++Files/sql/mysqld.vcproj
View file @ 2cbc50c5
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-classic-nt"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
...@@ -82,7 +81,6 @@ ...@@ -82,7 +81,6 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
...@@ -143,7 +141,6 @@ ...@@ -143,7 +141,6 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt-max"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
...@@ -207,7 +204,6 @@ ...@@ -207,7 +204,6 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
...@@ -271,7 +267,6 @@ ...@@ -271,7 +267,6 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro-nt"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
...@@ -393,7 +388,6 @@ ...@@ -393,7 +388,6 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
...@@ -455,7 +449,6 @@ ...@@ -455,7 +449,6 @@
CharacterSet="2"> CharacterSet="2">
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-classic"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
OptimizeForProcessor="2" OptimizeForProcessor="2"
......
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