Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1

into mysql.com:/usr/local/home/marty/MySQL/mysql-4.1

ndb/src/cw/cpcd/Process.cpp

@@ -220,8 +220,11 @@ set_ulimit(const BaseString & pair){
   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"){

ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp

@@ -799,7 +799,11 @@ AsyncFile::rmrfReq(Request * request, char * path, bool removePath){
       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",

ndb/src/ndbapi/Ndb.cpp

@@ -730,7 +730,7 @@ Ndb::getAutoIncrementValue(const char* aTableName, Uint32 cacheSize)
     DBUG_RETURN(~(Uint64)0);
   const NdbTableImpl *table= info->m_table_impl;
   Uint64 tupleId = getTupleIdFromNdb(table->m_tableId, cacheSize);
-  DBUG_PRINT("info", ("value %u", tupleId));
+  DBUG_PRINT("info", ("value %ul", (ulong) tupleId));
   DBUG_RETURN(tupleId);
 }
 
@@ -742,7 +742,7 @@ Ndb::getAutoIncrementValue(const NdbDictionary::Table * aTable, Uint32 cacheSize
     DBUG_RETURN(~(Uint64)0);
   const NdbTableImpl* table = & NdbTableImpl::getImpl(*aTable);
   Uint64 tupleId = getTupleIdFromNdb(table->m_tableId, cacheSize);
-  DBUG_PRINT("info", ("value %u", tupleId));
+  DBUG_PRINT("info", ("value %ul", (ulong) tupleId));
   DBUG_RETURN(tupleId);
 }
 
@@ -762,7 +762,8 @@ Ndb::getTupleIdFromNdb(Uint32 aTableId, Uint32 cacheSize)
   if ( theFirstTupleId[aTableId] != theLastTupleId[aTableId] )
   {
     theFirstTupleId[aTableId]++;
-    DBUG_PRINT("info", ("next cached value %u", theFirstTupleId[aTableId]));
+    DBUG_PRINT("info", ("next cached value %ul", 
+                        (ulong) theFirstTupleId[aTableId]));
     DBUG_RETURN(theFirstTupleId[aTableId]);
   }
   else // theFirstTupleId == theLastTupleId
@@ -783,7 +784,7 @@ Ndb::readAutoIncrementValue(const char* aTableName)
     DBUG_RETURN(~(Uint64)0);
   }
   Uint64 tupleId = readTupleIdFromNdb(table->m_tableId);
-  DBUG_PRINT("info", ("value %u", tupleId));
+  DBUG_PRINT("info", ("value %ul", (ulong) tupleId));
   DBUG_RETURN(tupleId);
 }
 
@@ -795,7 +796,7 @@ Ndb::readAutoIncrementValue(const NdbDictionary::Table * aTable)
     DBUG_RETURN(~(Uint64)0);
   const NdbTableImpl* table = & NdbTableImpl::getImpl(*aTable);
   Uint64 tupleId = readTupleIdFromNdb(table->m_tableId);
-  DBUG_PRINT("info", ("value %u", tupleId));
+  DBUG_PRINT("info", ("value %ul", (ulong) tupleId));
   DBUG_RETURN(tupleId);
 }
 

sql/ha_ndbcluster.cc

@@ -3003,8 +3003,10 @@ void ha_ndbcluster::start_bulk_insert(ha_rows rows)
   
   m_rows_inserted= (ha_rows) 0;
   if (rows == (ha_rows) 0)
+  {
     /* We don't know how many will be inserted, guess */
     m_rows_to_insert= m_autoincrement_prefetch;
+  }
   else
     m_rows_to_insert= rows; 
 
@@ -4021,8 +4023,10 @@ longlong ha_ndbcluster::get_auto_increment()
   Ndb *ndb= get_ndb();
   
   if (m_rows_inserted > m_rows_to_insert)
+  {
     /* We guessed too low */
     m_rows_to_insert+= m_autoincrement_prefetch;
+  }
   int cache_size= 
     (int)
     (m_rows_to_insert - m_rows_inserted < m_autoincrement_prefetch) ?