bk commit into 5.0 tree (holyfoot:1.2096) BUG#18455

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of hf. When hf does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2096 06/04/26 15:58:27 holyfoot@deer.(none) +3 -0
  bug #18455 (embedded server Win32 build)

  VC++Files/libmysqld/libmysqld_ia64.dsp
    1.4 06/04/26 15:57:12 holyfoot@stripped +4 -0
    my_user.c added

  VC++Files/libmysqld/libmysqld.vcproj
    1.4 06/04/26 15:57:12 holyfoot@stripped +36 -0
    my_user.c file added

  VC++Files/libmysqld/libmysqld.dsp
    1.30 06/04/26 15:57:12 holyfoot@stripped +4 -0
    my_user.c file added

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	holyfoot
# Host:	deer.(none)
# Root:	/home/hf/work/mysql-5.0.18455

--- 1.3/VC++Files/libmysqld/libmysqld_ia64.dsp	Sat Jun 25 01:41:30 2005
+++ 1.4/VC++Files/libmysqld/libmysqld_ia64.dsp	Wed Apr 26 15:57:12 2006
@@ -338,6 +338,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE="..\sql-common\my_user.c"
+# End Source File
+# Begin Source File
+
 SOURCE=..\sql\net_serv.cpp
 # End Source File
 # Begin Source File

--- 1.3/VC++Files/libmysqld/libmysqld.vcproj	Sat Apr  1 05:21:32 2006
+++ 1.4/VC++Files/libmysqld/libmysqld.vcproj	Wed Apr 26 15:57:12 2006
@@ -2010,6 +2010,42 @@
 			</FileConfiguration>
 		</File>
 		<File
+			RelativePath="..\sql-common\my_user.c">
+			<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\net_serv.cpp">
 			<FileConfiguration
 				Name="Debug|Win32">

--- 1.29/VC++Files/libmysqld/libmysqld.dsp	Tue Oct 18 02:34:58 2005
+++ 1.30/VC++Files/libmysqld/libmysqld.dsp	Wed Apr 26 15:57:12 2006
@@ -363,6 +363,10 @@
 SOURCE=..\sql-common\my_time.c
 # End Source File
 # Begin Source File
+ 
+SOURCE=..\sql-common\my_user.c
+# End Source File
+# Begin Source File
 
 SOURCE=..\sql\net_serv.cpp
 # End Source File