From c621d4e45cad86aff09705da83fe8991a4057c04 Mon Sep 17 00:00:00 2001 From: "joerg@trift2." <> Date: Mon, 17 Jul 2006 20:40:41 +0200 Subject: [PATCH] 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 | 4 + VC++Files/libmysqld/libmysqld.vcproj | 36 ++++ VC++Files/libmysqld/libmysqld_ia64.dsp | 4 + VC++Files/mysqldemb/mysqldemb.dsp | 4 + VC++Files/mysqldemb/mysqldemb.vcproj | 36 ++++ VC++Files/mysqldemb/mysqldemb_ia64.dsp | 4 + VC++Files/sql/mysqld.dsp | 4 + VC++Files/sql/mysqld.vcproj | 76 +++++++++ VC++Files/sql/mysqld_ia64.dsp | 4 + VC++Files/sql/mysqldmax.dsp | 16 ++ VC++Files/sql/mysqldmax_ia64.dsp | 25 +++ sql/sql_locale.cc | 218 ++++++++++++------------- 12 files changed, 322 insertions(+), 109 deletions(-) diff --git a/VC++Files/libmysqld/libmysqld.dsp b/VC++Files/libmysqld/libmysqld.dsp index 0e3e6af03f0..a07f94ef135 100644 --- a/VC++Files/libmysqld/libmysqld.dsp +++ b/VC++Files/libmysqld/libmysqld.dsp @@ -468,6 +468,10 @@ SOURCE=..\sql\sql_load.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 diff --git a/VC++Files/libmysqld/libmysqld.vcproj b/VC++Files/libmysqld/libmysqld.vcproj index ecbd7383478..a557290117b 100644 --- a/VC++Files/libmysqld/libmysqld.vcproj +++ b/VC++Files/libmysqld/libmysqld.vcproj @@ -2945,6 +2945,42 @@ PreprocessorDefinitions="WIN32;_WINDOWS;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;USE_TLS;__WIN__;LICENSE=Commercial;DBUG_OFF;_MBCS;NDEBUG;$(NoInherit)"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +