diff options
| author | unknown <kent@mysql.com> | 2006-04-04 23:37:44 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-04-04 23:37:44 +0200 |
| commit | 07302c60078b21b90d00b80677beced5de521f10 (patch) | |
| tree | d7f97f7f906b9107f2569658a74eb1ae2f1eea72 /VC++Files | |
| parent | af66d20c8eed478ea0a81ba38fea07152823a9d0 (diff) | |
| parent | b5ca723613666bc6472de8d02e50fee7ea7785ef (diff) | |
| download | mariadb-git-07302c60078b21b90d00b80677beced5de521f10.tar.gz | |
Merge
VC++Files/libmysqld/libmysqld.vcproj:
Auto merged
VC++Files/mysqldemb/mysqldemb.vcproj:
Auto merged
VC++Files/mysys/mysys.vcproj:
Auto merged
VC++Files/sql/mysqld.vcproj:
Auto merged
VC++Files/storage/bdb/bdb.vcproj:
Auto merged
VC++Files/storage/innobase/innobase.vcproj:
Auto merged
config/ac-macros/yassl.m4:
Auto merged
libmysql/Makefile.am:
Auto merged
libmysql_r/Makefile.am:
Auto merged
mysql-test/Makefile.am:
Auto merged
sql/item.cc:
Auto merged
Diffstat (limited to 'VC++Files')
| -rw-r--r-- | VC++Files/libmysqld/libmysqld.vcproj | 1 | ||||
| -rw-r--r-- | VC++Files/mysqldemb/mysqldemb.vcproj | 1 | ||||
| -rw-r--r-- | VC++Files/mysys/mysys.vcproj | 1 | ||||
| -rw-r--r-- | VC++Files/sql/mysqld.vcproj | 7 | ||||
| -rw-r--r-- | VC++Files/storage/bdb/bdb.vcproj | 1 | ||||
| -rw-r--r-- | VC++Files/storage/innobase/innobase.vcproj | 2 |
6 files changed, 0 insertions, 13 deletions
diff --git a/VC++Files/libmysqld/libmysqld.vcproj b/VC++Files/libmysqld/libmysqld.vcproj index 2ca2401826d..a8410ee958f 100644 --- a/VC++Files/libmysqld/libmysqld.vcproj +++ b/VC++Files/libmysqld/libmysqld.vcproj @@ -86,7 +86,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" diff --git a/VC++Files/mysqldemb/mysqldemb.vcproj b/VC++Files/mysqldemb/mysqldemb.vcproj index 657fbec2ccc..bf5fc557882 100644 --- a/VC++Files/mysqldemb/mysqldemb.vcproj +++ b/VC++Files/mysqldemb/mysqldemb.vcproj @@ -71,7 +71,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro" Optimization="2" InlineFunctionExpansion="1" AdditionalIncludeDirectories="../include,../regex,../libmysqld,../sql,../zlib" diff --git a/VC++Files/mysys/mysys.vcproj b/VC++Files/mysys/mysys.vcproj index 7e010cd3786..befb4ad58b0 100644 --- a/VC++Files/mysys/mysys.vcproj +++ b/VC++Files/mysys/mysys.vcproj @@ -67,7 +67,6 @@ ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" diff --git a/VC++Files/sql/mysqld.vcproj b/VC++Files/sql/mysqld.vcproj index ea617e4f413..641e1f8e8f4 100644 --- a/VC++Files/sql/mysqld.vcproj +++ b/VC++Files/sql/mysqld.vcproj @@ -20,7 +20,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-classic-nt" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" @@ -82,7 +81,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" @@ -143,7 +141,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt-max" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" @@ -207,7 +204,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" @@ -271,7 +267,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro-nt" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" @@ -393,7 +388,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-pro" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" @@ -455,7 +449,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-classic" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" diff --git a/VC++Files/storage/bdb/bdb.vcproj b/VC++Files/storage/bdb/bdb.vcproj index 692526d147c..6a94a44d8de 100644 --- a/VC++Files/storage/bdb/bdb.vcproj +++ b/VC++Files/storage/bdb/bdb.vcproj @@ -20,7 +20,6 @@ ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" diff --git a/VC++Files/storage/innobase/innobase.vcproj b/VC++Files/storage/innobase/innobase.vcproj index 1c4cb23a7a6..cd3c68997a1 100644 --- a/VC++Files/storage/innobase/innobase.vcproj +++ b/VC++Files/storage/innobase/innobase.vcproj @@ -21,7 +21,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt-max" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" @@ -176,7 +175,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" |