bk commit into 5.0 tree (reggie:1.1894)

[reggie]

Below is the list of changes that have just been committed into a local
5.0 repository of reggie. When reggie 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.1894 05/05/23 12:55:39 reggie@mdk10.(none) +5 -0
  merged changes from 4.1

  sql/ha_myisammrg.cc
    1.63 05/05/23 12:55:24 reggie@mdk10.(none) +0 -2
    merged changes from 4.1

  strings/my_vsnprintf.c
    1.32 05/05/23 12:36:35 reggie@mdk10.(none) +0 -0
    Auto merged

  ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
    1.17 05/05/23 12:36:34 reggie@mdk10.(none) +0 -0
    Auto merged

  ndb/src/cw/cpcd/Process.cpp
    1.19 05/05/23 12:36:34 reggie@mdk10.(none) +0 -0
    Auto merged

  include/my_global.h
    1.87 05/05/23 12:36:34 reggie@mdk10.(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:	reggie
# Host:	mdk10.(none)
# Root:	/home/reggie/bk/mysql-5.0/RESYNC

--- 1.31/strings/my_vsnprintf.c	2005-05-20 08:14:30 -05:00
+++ 1.32/strings/my_vsnprintf.c	2005-05-23 12:36:35 -05:00
@@ -28,7 +28,7 @@
     %#[l]u
     %#[l]x
     %#.#s	Note first # is ignored
-
+    
   RETURN
     length of result string
 */

--- 1.18/ndb/src/cw/cpcd/Process.cpp	2005-05-09 10:04:20 -05:00
+++ 1.19/ndb/src/cw/cpcd/Process.cpp	2005-05-23 12:36:34 -05:00
@@ -223,11 +223,8 @@
   if(!(list[1].trim() == "unlimited")){
     value = atoi(list[1].c_str());
   }
-#if defined(__INTEL_COMPILER)
-  struct rlimit64 rlp;
-#else
+
   struct rlimit rlp;
-#endif
 #define _RLIMIT_FIX(x) { res = getrlimit(x,&rlp); if(!res){ rlp.rlim_cur = value; res
= setrlimit(x, &rlp); }}
   
   if(list[0].trim() == "c"){

--- 1.86/include/my_global.h	2005-05-20 08:21:19 -05:00
+++ 1.87/include/my_global.h	2005-05-23 12:36:34 -05: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