diff options
| author | unknown <kent@mysql.com> | 2006-04-01 02:46:32 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-04-01 02:46:32 +0200 |
| commit | 835d2286f507b7d6e24fc87e5a4676e639c2c52d (patch) | |
| tree | 5ee7b0d47a6b50b55de5e862a57e55141ffd0345 /VC++Files | |
| parent | ab96fa07287588d75de1f5f5419f95490250f56c (diff) | |
| parent | 0ad405f9d4665a13e74c60520186f25d48b4c8ff (diff) | |
| download | mariadb-git-835d2286f507b7d6e24fc87e5a4676e639c2c52d.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-new
into mysql.com:/Users/kent/mysql/bk/mysql-5.0-new
VC++Files/libmysqld/libmysqld.vcproj:
Auto merged
VC++Files/mysys/mysys.vcproj:
Auto merged
VC++Files/sql/mysqld.vcproj:
Auto merged
Diffstat (limited to 'VC++Files')
| -rw-r--r-- | VC++Files/bdb/bdb.vcproj | 1 | ||||
| -rw-r--r-- | VC++Files/innobase/innobase.vcproj | 2 | ||||
| -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 |
6 files changed, 0 insertions, 13 deletions
diff --git a/VC++Files/bdb/bdb.vcproj b/VC++Files/bdb/bdb.vcproj index 6258da3cb3a..56c4da94084 100644 --- a/VC++Files/bdb/bdb.vcproj +++ b/VC++Files/bdb/bdb.vcproj @@ -19,7 +19,6 @@ ATLMinimizesCRunTimeLibraryUsage="FALSE"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-max" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" diff --git a/VC++Files/innobase/innobase.vcproj b/VC++Files/innobase/innobase.vcproj index 9d972366440..ce607bf0813 100644 --- a/VC++Files/innobase/innobase.vcproj +++ b/VC++Files/innobase/innobase.vcproj @@ -20,7 +20,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt-max" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" @@ -175,7 +174,6 @@ CharacterSet="2"> <Tool Name="VCCLCompilerTool" - AdditionalOptions="/D MYSQL_SERVER_SUFFIX=-nt" Optimization="2" InlineFunctionExpansion="1" OptimizeForProcessor="2" diff --git a/VC++Files/libmysqld/libmysqld.vcproj b/VC++Files/libmysqld/libmysqld.vcproj index eb411f79362..47fb660bb7a 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 52081adb214..1105e750ee7 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 6ec9ca6d564..d124551e0bb 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 d5a10db380a..3f20cffec0a 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" |