mirror of
https://github.com/MariaDB/server.git
synced 2025-07-30 16:24:05 +03:00
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
This commit is contained in:
@ -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"
|
||||
|
Reference in New Issue
Block a user