bk commit into 5.0 tree (msvensson:1.1900)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.1900 05/05/23 19:01:16 msvensson@neptunus.(none) +7 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0.6-build
  into neptunus.(none):/home/msvensson/mysql/mysql-5.0-tmp

  strings/my_vsnprintf.c
    1.32 05/05/23 19:01:15 msvensson@neptunus.(none) +0 -10
    Auto merged

  sql/sql_select.cc
    1.324 05/05/23 19:01:14 msvensson@neptunus.(none) +0 -2
    Auto merged

  sql/sql_delete.cc
    1.147 05/05/23 19:01:14 msvensson@neptunus.(none) +0 -1
    Auto merged

  sql/field_conv.cc
    1.46 05/05/23 19:01:14 msvensson@neptunus.(none) +0 -5
    Auto merged

  myisam/rt_split.c
    1.13 05/05/23 19:01:14 msvensson@neptunus.(none) +0 -8
    Auto merged

  include/my_global.h
    1.87 05/05/23 19:01:14 msvensson@neptunus.(none) +0 -0
    Auto merged

  VC++Files/mysys/mysys.dsp
    1.27 05/05/23 19:01:14 msvensson@neptunus.(none) +0 -0
    Auto merged

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-tmp/RESYNC

--- 1.26/VC++Files/mysys/mysys.dsp	2005-05-20 23:31:12 +02:00
+++ 1.27/VC++Files/mysys/mysys.dsp	2005-05-23 19:01:14 +02:00
@@ -209,6 +209,10 @@
 # End Source File
 # Begin Source File
 
+SOURCE=.\default_modify.c
+# End Source File
+# Begin Source File
+
 SOURCE=.\errors.c
 # End Source File
 # Begin Source File

--- 1.86/include/my_global.h	2005-05-20 15:21:19 +02:00
+++ 1.87/include/my_global.h	2005-05-23 19:01:14 +02:00
@@ -44,7 +44,7 @@
 #endif /* __CYGWIN__ */
 
 /* Determine when to use "#pragma interface" */
-#if !defined(__CYGWIN__) && !defined(__ICC) && defined(__GNUC__)
&& (__GNUC__ < 3)
+#if !defined(__CYGWIN__) && !defined(__INTEL_COMPILER) &&
defined(__GNUC__) && (__GNUC__ < 3)
 #define USE_PRAGMA_INTERFACE
 #endif