Commit d6d59830 authored by unknown's avatar unknown
Browse files

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".
parents 4e31c3fe d7c0c667

VC++Files/libmysqld/libmysqld.dsp

+4 −0
Original line number Diff line number Diff line
@@ -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

VC++Files/libmysqld/libmysqld.vcproj

+36 −0
Original line number Diff line number Diff line
@@ -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

VC++Files/libmysqld/libmysqld_ia64.dsp

+4 −0
Original line number Diff line number Diff line
@@ -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

VC++Files/mysqldemb/mysqldemb.dsp

+4 −0
Original line number Diff line number Diff line
@@ -361,6 +361,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

VC++Files/mysqldemb/mysqldemb.vcproj

+36 −0
Original line number Diff line number Diff line
@@ -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