bk commit into 4.1 tree (mskold:1.2245)

[Martin Skold]

Below is the list of changes that have just been committed into a local
4.1 repository of marty. When marty 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.2245 05/05/08 22:16:24 mskold@stripped +2 -0
  Fixes to compile with icc

  ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
    1.15 05/05/08 22:15:59 mskold@stripped +4 -0
    Fixes to compile with icc

  ndb/src/cw/cpcd/Process.cpp
    1.16 05/05/08 22:15:59 mskold@stripped +4 -1
    Fixes to compile with icc

# 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:	mskold
# Host:	blowfish.ndb.mysql.com
# Root:	/usr/local/home/marty/MySQL/mysql-4.1

--- 1.15/ndb/src/cw/cpcd/Process.cpp	Sat Oct 23 11:05:21 2004
+++ 1.16/ndb/src/cw/cpcd/Process.cpp	Sun May  8 22:15:59 2005
@@ -220,8 +220,11 @@
   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.14/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	Tue Feb  1 19:01:34 2005
+++ 1.15/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	Sun May  8 22:15:59 2005
@@ -799,7 +799,11 @@
       request->error = errno;
     return;
   }
+#if defined(__INTEL_COMPILER)
+  struct dirent64 * dp;
+#else
   struct dirent * dp;
+#endif
   while ((dp = readdir(dirp)) != NULL){
     if ((strcmp(".", dp->d_name) != 0) && (strcmp("..", dp->d_name) != 0))
{
       BaseString::snprintf(path_add, (size_t)path_max_copy, "%s%s",