bk commit into 5.1 tree (jonas:1.2534)

[jonas]

Below is the list of changes that have just been committed into a local
5.1 repository of jonas. When jonas 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@stripped, 2007-05-14 16:04:42+02:00, jonas@stripped +2 -0
  ndb -
    Make computeHash static, taking NdbError as argument

  storage/ndb/include/ndbapi/Ndb.hpp@stripped, 2007-05-14 16:04:40+02:00, jonas@stripped +22 -0
    Make computeHash static, taking NdbError as argument

  storage/ndb/src/ndbapi/Ndb.cpp@stripped, 2007-05-14 16:04:40+02:00, jonas@stripped +9 -8
    Make computeHash static, taking NdbError as argument

# 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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/51-telco

--- 1.66/storage/ndb/include/ndbapi/Ndb.hpp	2007-05-14 16:04:47 +02:00
+++ 1.67/storage/ndb/include/ndbapi/Ndb.hpp	2007-05-14 16:04:47 +02:00
@@ -1830,6 +1830,28 @@
 #ifdef VM_TRACE
   void printState(const char* fmt, ...);
 #endif
+
+  friend void
+  set_distribution_key_from_range(class NdbIndexScanOperation *op,
+                                  const class NdbRecord *record,
+                                  const char *row,
+                                  Uint32 distkey_max);
+
+  static int computeHash(NdbError*, Uint32* hashvalueptr,
+                         const NdbDictionary::Table*, 
+                         const struct Key_part_ptr * keyData,
+                         void* xfrmbuf, Uint32 xfrmbuflen);
 };
+
+inline
+int 
+Ndb::computeHash(Uint32* hashvalueptr,
+                 const NdbDictionary::Table* table, 
+                 const struct Key_part_ptr * keyData,
+                 void* xfrmbuf, Uint32 xfrmbuflen)
+{
+  return Ndb::computeHash(&theError, hashvalueptr, table, keyData,
+                          xfrmbuf, xfrmbuflen);
+}
 
 #endif

--- 1.88/storage/ndb/src/ndbapi/Ndb.cpp	2007-05-14 16:04:47 +02:00
+++ 1.89/storage/ndb/src/ndbapi/Ndb.cpp	2007-05-14 16:04:47 +02:00
@@ -306,7 +306,8 @@
 Remark:         Start transaction. Synchronous.
 *****************************************************************************/ 
 int
-Ndb::computeHash(Uint32 *retval,
+Ndb::computeHash(NdbError* theError,
+                 Uint32 *retval,
                  const NdbDictionary::Table *table,
                  const struct Key_part_ptr * keyData, 
                  void* buf, Uint32 bufLen)
@@ -456,34 +457,34 @@
   return 0;
   
 enullptr:
-  theError.code = 4316;
+  theError->code = 4316;
   return -1;
   
 emissingnullptr:
-  theError.code = 4276;
+  theError->code = 4276;
   return -1;
 
 elentosmall:
-  theError.code = 4277;
+  theError->code = 4277;
   return -1;
 
 ebuftosmall:
-  theError.code = 4278;
+  theError->code = 4278;
   return -1;
 
 emalformedstring:
   if (bufLen == 0)
     free(buf);
   
-  theError.code = 4279;
+  theError->code = 4279;
   return -1;
   
 emalformedkey:
-  theError.code = 4280;
+  theError->code = 4280;
   return -1;
 
 enomem:
-  theError.code = 4000;
+  theError->code = 4000;
   return -1;
 
 }