Merge mysql.com:/home/jonas/src/mysql-5.0

into mysql.com:/home/jonas/src/mysql-5.0-ndb


BitKeeper/etc/logging_ok:
  auto-union
mysql-test/mysql-test-run.sh:
  Auto merged
ndb/src/kernel/blocks/dbdict/Dbdict.cpp:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/ha_ndbcluster.h:
  Auto merged
sql/item.cc:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_class.h:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged

6 files changed, 23 insertions, 6 deletions

diff --git a/ndb/src/cw/cpcd/Process.cpp b/ndb/src/cw/cpcd/Process.cpp
index fc5dc2d8839..cfffec7d0ce 100644
--- a/ndb/src/cw/cpcd/Process.cpp
+++ b/ndb/src/cw/cpcd/Process.cpp
@@ -223,8 +223,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"){
diff --git a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
index 284e2cda2e6..0b68bc966d6 100644
--- a/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
+++ b/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
@@ -4218,12 +4218,14 @@ calcLHbits(Uint32 * lhPageBits, Uint32 * lhDistrBits,
     tmp <<= 1;
     distrBits++;
   }//while
+#ifdef ndb_classical_lhdistrbits
   if (tmp != totalFragments) {
     tmp >>= 1;
     if ((fid >= (totalFragments - tmp)) && (fid < (tmp - 1))) {
       distrBits--;
     }//if
   }//if
+#endif
   * lhPageBits = pageBits;
   * lhDistrBits = distrBits;
 
diff --git a/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp b/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
index cbd56c3281f..470b98fd04c 100644
--- a/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
+++ b/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
@@ -443,6 +443,7 @@ Dbtup::commitRecord(Signal* signal,
     saveAttributeMask.bitOR(befOpPtr.p->changeMask);
     befOpPtr.p->changeMask.clear();
     befOpPtr.p->changeMask.bitOR(attributeMask);
+    befOpPtr.p->gci = regOperPtr->gci;
     
     operPtr.p = befOpPtr.p;
     checkDetachedTriggers(signal,
@@ -480,6 +481,7 @@ Dbtup::commitRecord(Signal* signal,
     befOpPtr.p->pageOffset = befOpPtr.p->pageOffsetC;
     befOpPtr.p->fragPageId = befOpPtr.p->fragPageIdC;
     befOpPtr.p->pageIndex  = befOpPtr.p->pageIndexC;
+    befOpPtr.p->gci = regOperPtr->gci;
 
     operPtr.p = befOpPtr.p;
     checkDetachedTriggers(signal,
diff --git a/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp b/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
index f76440a462a..b3fc6e04d6c 100644
--- a/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
+++ b/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",
diff --git a/ndb/src/kernel/error/ErrorReporter.cpp b/ndb/src/kernel/error/ErrorReporter.cpp
index 38088fe8f3e..e4ead4ce34d 100644
--- a/ndb/src/kernel/error/ErrorReporter.cpp
+++ b/ndb/src/kernel/error/ErrorReporter.cpp
@@ -238,6 +238,11 @@ WriteMessage(ErrorCategory thrdType, int thrdMessageID,
     // Create a new file, and skip the first 69 bytes, 
     // which are info about the current offset
     stream = fopen(theErrorFileName, "w");
+    if(stream == NULL)
+    {
+      fprintf(stderr,"Unable to open error log file: %s\n", theErrorFileName);
+      return -1;
+    }
     fprintf(stream, "%s%u%s", "Current byte-offset of file-pointer is: ", 69,
 	    "                        \n\n\n");   
     
diff --git a/ndb/src/ndbapi/Ndb.cpp b/ndb/src/ndbapi/Ndb.cpp
index c01ce823dc0..5efef1b0112 100644
--- a/ndb/src/ndbapi/Ndb.cpp
+++ b/ndb/src/ndbapi/Ndb.cpp
@@ -764,7 +764,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);
 }
 
@@ -776,7 +776,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);
 }
 
@@ -796,7 +796,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
@@ -817,7 +818,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);
 }
 
@@ -829,7 +830,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);
 }