diff options
author | unknown <joerg@trift2.> | 2006-07-17 20:40:41 +0200 |
---|---|---|
committer | unknown <joerg@trift2.> | 2006-07-17 20:40:41 +0200 |
commit | 1c41013285b9a10a4ac267fad836ee957318c089 (patch) | |
tree | da224d6cd5d0e9aed6d2b773f65ed194e88bd85b /VC++Files/mysqldemb | |
parent | a9fb36e2755f7a1c9e8709c688e55960105b8986 (diff) | |
download | mariadb-git-1c41013285b9a10a4ac267fad836ee957318c089.tar.gz |
Changes to make "sql/sql_locale.cc" compile + link on Windows:
1) When initializing a boolean variable, do not use string representations '"false"' and '"true"'
but rather the boolean values 'false' and 'true'.
2) Add the module to the various Windows description files.
VC++Files/libmysqld/libmysqld.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/libmysqld/libmysqld.vcproj:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/libmysqld/libmysqld_ia64.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/mysqldemb/mysqldemb.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/mysqldemb/mysqldemb.vcproj:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/mysqldemb/mysqldemb_ia64.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/sql/mysqld.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/sql/mysqld.vcproj:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/sql/mysqld_ia64.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/sql/mysqldmax.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
VC++Files/sql/mysqldmax_ia64.dsp:
Add "sql/sql_locale.cpp" with similar settings as the other files.
sql/sql_locale.cc:
When initializing a boolean variable, do not use stringrepresentations '"false"' and '"true"'
but rather the boolean values 'false' and 'true'.
Diffstat (limited to 'VC++Files/mysqldemb')
-rw-r--r-- | VC++Files/mysqldemb/mysqldemb.dsp | 4 | ||||
-rw-r--r-- | VC++Files/mysqldemb/mysqldemb.vcproj | 36 | ||||
-rw-r--r-- | VC++Files/mysqldemb/mysqldemb_ia64.dsp | 4 |
3 files changed, 44 insertions, 0 deletions
diff --git a/VC++Files/mysqldemb/mysqldemb.dsp b/VC++Files/mysqldemb/mysqldemb.dsp index a8207d436a0..63a91ee674e 100644 --- a/VC++Files/mysqldemb/mysqldemb.dsp +++ b/VC++Files/mysqldemb/mysqldemb.dsp @@ -363,6 +363,10 @@ SOURCE=..\sql\sql_lex.cpp SOURCE=..\sql\sql_list.cpp
# End Source File
+# Begin Source File + +SOURCE=..\sql\sql_locale.cpp +# End Source File # Begin Source File
SOURCE=..\sql\sql_manager.cpp
diff --git a/VC++Files/mysqldemb/mysqldemb.vcproj b/VC++Files/mysqldemb/mysqldemb.vcproj index 1105e750ee7..8c052735661 100644 --- a/VC++Files/mysqldemb/mysqldemb.vcproj +++ b/VC++Files/mysqldemb/mysqldemb.vcproj @@ -2234,6 +2234,42 @@ </FileConfiguration> </File> <File + RelativePath="..\sql\sql_locale.cpp"> + <FileConfiguration + Name="classic|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="pro|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + <FileConfiguration + Name="Debug|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="0" + AdditionalIncludeDirectories="" + PreprocessorDefinitions="" + BasicRuntimeChecks="3"/> + </FileConfiguration> + <FileConfiguration + Name="Release|Win32"> + <Tool + Name="VCCLCompilerTool" + Optimization="2" + AdditionalIncludeDirectories="" + PreprocessorDefinitions=""/> + </FileConfiguration> + </File> + <File RelativePath="..\sql\sql_manager.cpp"> <FileConfiguration Name="classic|Win32"> diff --git a/VC++Files/mysqldemb/mysqldemb_ia64.dsp b/VC++Files/mysqldemb/mysqldemb_ia64.dsp index 5b54a7756e1..9d7367e4c0f 100644 --- a/VC++Files/mysqldemb/mysqldemb_ia64.dsp +++ b/VC++Files/mysqldemb/mysqldemb_ia64.dsp @@ -365,6 +365,10 @@ SOURCE=..\sql\sql_list.cpp # End Source File # Begin Source File +SOURCE=..\sql\sql_locale.cpp +# End Source File +# Begin Source File + SOURCE=..\sql\sql_manager.cpp # End Source File # Begin Source File |