Commit b7cf8cef authored by joerg@trift2.'s avatar joerg@trift2.
Browse files

Merge trift2.:/M41/clone-4.1 

into  trift2.:/M41/push-4.1
parents 694d4999 9a7d888a

VC++Files/libmysqld/libmysqld.dsp

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

VC++Files/libmysqld/libmysqld.vcproj

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

			</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
@@ -450,6 +450,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
@@ -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

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