Merge trift2.:/M41/clone-4.1

into trift2.:/M50/merge-4.1-to-5.0 VC++Files/libmysqld/libmysqld.dsp: Auto merged VC++Files/libmysqld/libmysqld.vcproj: Auto merged VC++Files/libmysqld/libmysqld_ia64.dsp: Auto merged VC++Files/mysqldemb/mysqldemb.dsp: Auto merged VC++Files/sql/mysqld.dsp: Auto merged VC++Files/sql/mysqld.vcproj: Auto merged VC++Files/sql/mysqld_ia64.dsp: Auto merged VC++Files/sql/mysqldmax.dsp: Auto merged sql/field.cc: Merge a backport == Null-merge == "ul". sql/field.h: Merge a backport == Null-merge == "ul". sql/sql_locale.cc: Changes were already present (and even better) == Null-merge == "ul".

Merge trift2.:/M41/clone-4.1
into trift2.:/M50/merge-4.1-to-5.0 VC++Files/libmysqld/libmysqld.dsp: Auto merged VC++Files/libmysqld/libmysqld.vcproj: Auto merged VC++Files/libmysqld/libmysqld_ia64.dsp: Auto merged VC++Files/mysqldemb/mysqldemb.dsp: Auto merged VC++Files/sql/mysqld.dsp: Auto merged VC++Files/sql/mysqld.vcproj: Auto merged VC++Files/sql/mysqld_ia64.dsp: Auto merged VC++Files/sql/mysqldmax.dsp: Auto merged sql/field.cc: Merge a backport == Null-merge == "ul". sql/field.h: Merge a backport == Null-merge == "ul". sql/sql_locale.cc: Changes were already present (and even better) == Null-merge == "ul".
d6d59830 · unknown · 4e31c3fe · d7c0c667 · d6d59830 · d6d59830
Commit d6d59830 authored Jul 24, 2006 by unknown
11 changed files
--- a/VC++Files/libmysqld/libmysqld.dsp
+++ b/VC++Files/libmysqld/libmysqld.dsp
@@ -504,6 +504,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

--- a/VC++Files/libmysqld/libmysqld.vcproj
+++ b/VC++Files/libmysqld/libmysqld.vcproj
@@ -3305,6 +3305,42 @@
 					PreprocessorDefinitions="WIN32;_WINDOWS;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;USE_TLS;__WIN__;LICENSE=Commercial;DBUG_OFF;_MBCS;NDEBUG;$(NoInherit)"/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="..\sql\sql_locale.cpp">
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;SAFEMALLOC;HAVE_BERKELEY_DB;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;USE_TLS;__WIN__;$(NoInherit)"
+					BasicRuntimeChecks="3"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="pro|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="WIN32;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;EMBEDDED_LIBRARY;USE_TLS;__WIN__;MYSQL_SERVER;LICENSE=Commercial;_MBCS;HAVE_DLOPEN;HAVE_INNOBASE_DB;DBUG_OFF;NDEBUG;_WINDOWS;_CONSOLE;$(NoInherit)"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_MBCS;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;HAVE_INNOBASE_DB;DBUG_OFF;USE_TLS;__WIN__;$(NoInherit)"/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="classic|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions="WIN32;_WINDOWS;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;USE_TLS;__WIN__;LICENSE=Commercial;DBUG_OFF;_MBCS;NDEBUG;$(NoInherit)"/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="..\sql\sql_manager.cpp">
 			<FileConfiguration

--- a/VC++Files/libmysqld/libmysqld_ia64.dsp
+++ b/VC++Files/libmysqld/libmysqld_ia64.dsp
@@ -454,6 +454,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

--- a/VC++Files/mysqldemb/mysqldemb.dsp
+++ b/VC++Files/mysqldemb/mysqldemb.dsp
@@ -359,6 +359,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

--- a/VC++Files/mysqldemb/mysqldemb.vcproj
+++ b/VC++Files/mysqldemb/mysqldemb.vcproj
@@ -2233,6 +2233,42 @@
 					PreprocessorDefinitions=""/>
 			</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

--- 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

--- a/VC++Files/sql/mysqld.dsp
+++ b/VC++Files/sql/mysqld.dsp
@@ -1639,6 +1639,10 @@ SOURCE=.\sql_load.cpp
 # End Source File
 # Begin Source File

+SOURCE=.\sql\sql_locale.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\sql_manager.cpp
 # End Source File
 # Begin Source File

--- a/VC++Files/sql/mysqld.vcproj
+++ b/VC++Files/sql/mysqld.vcproj
@@ -6833,6 +6833,82 @@
 					PreprocessorDefinitions=""/>
 			</FileConfiguration>
 		</File>
+		<File
+			RelativePath="sql_locale.cpp">
+			<FileConfiguration
+				Name="classic nt|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Max|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Max nt|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="nt|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="pro nt|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Debug|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="0"
+					OptimizeForProcessor="1"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="pro|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="classic|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+			<FileConfiguration
+				Name="Release|Win32">
+				<Tool
+					Name="VCCLCompilerTool"
+					Optimization="2"
+					AdditionalIncludeDirectories=""
+					PreprocessorDefinitions=""/>
+			</FileConfiguration>
+		</File>
 		<File
 			RelativePath="sql_manager.cpp">
 			<FileConfiguration

--- a/VC++Files/sql/mysqld_ia64.dsp
+++ b/VC++Files/sql/mysqld_ia64.dsp
@@ -1607,6 +1607,10 @@ SOURCE=.\sql_load.cpp
 # End Source File
 # Begin Source File

+SOURCE=.\sql_locale.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\sql_manager.cpp
 # End Source File
 # Begin Source File

--- a/VC++Files/sql/mysqldmax.dsp
+++ b/VC++Files/sql/mysqldmax.dsp
@@ -781,6 +781,22 @@ SOURCE=.\sql_load.cpp
 # End Source File
 # Begin Source File

+SOURCE=.\sql_locale.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\sql_manager.cpp
 # End Source File
 # Begin Source File

--- a/VC++Files/sql/mysqldmax_ia64.dsp
+++ b/VC++Files/sql/mysqldmax_ia64.dsp
@@ -1195,6 +1195,31 @@ SOURCE=.\sql_load.cpp
 # End Source File
 # Begin Source File

+SOURCE=.\sql_locale.cpp
+
+!IF  "$(CFG)" == "mysqldmax - Win32 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 Debug"
+
+# ADD CPP /G5 /Od
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - Win32 nt"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Release"
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 Debug"
+
+# ADD CPP /G5 /Od /G2 /EHsc /D"_IA64_" /Zi /D"WIN64" /D"WIN32" /D"_AFX_NO_DAO_SUPPORT" /Wp64 /Zm600
+# SUBTRACT CPP /YX /Yc /Yu
+
+!ELSEIF  "$(CFG)" == "mysqldmax - WinIA64 nt"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
 SOURCE=.\sql_manager.cpp
 # End Source File
 # Begin Source File