bk commit into 5.1 tree (knielsen:1.2326)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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, 2006-12-04 09:55:11+01:00, knielsen@ymer.(none) +6 -0
  WL#2223: NdbRecord.
  Misc. minor fixes.

  storage/ndb/include/ndbapi/Ndb.hpp@stripped, 2006-12-04 09:55:08+01:00, knielsen@ymer.(none)
+0 -1
    Comment fix.

  storage/ndb/src/ndbapi/NdbDictionary.cpp@stripped, 2006-12-04 09:55:08+01:00,
knielsen@ymer.(none) +1 -1
    Fix typo.

  storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp@stripped, 2006-12-04 09:55:08+01:00,
knielsen@ymer.(none) +2 -2
    Portability fix.

  storage/ndb/src/ndbapi/NdbOperationExec.cpp@stripped, 2006-12-04 09:55:08+01:00,
knielsen@ymer.(none) +3 -0
    Comment fix.

  storage/ndb/src/ndbapi/NdbTransaction.cpp@stripped, 2006-12-04 09:55:08+01:00,
knielsen@ymer.(none) +2 -0
    DBUG fix.

  storage/ndb/test/ndbapi/flexBench.cpp@stripped, 2006-12-04 09:55:08+01:00,
knielsen@ymer.(none) +2 -2
    Fix off-by-one bug with long PKs.

# 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:	knielsen
# Host:	ymer.(none)
# Root:	/usr/local/mysql/mysql-5.1-wl2223

--- 1.60/storage/ndb/include/ndbapi/Ndb.hpp	2006-12-04 09:55:17 +01:00
+++ 1.61/storage/ndb/include/ndbapi/Ndb.hpp	2006-12-04 09:55:17 +01:00
@@ -846,7 +846,6 @@
    The interface is used to send many transactions 
    at the same time to the NDB kernel.  
    This is often much more efficient than using synchronous transactions.
-   The main reason for using this method is to ensure that 
    Sending many transactions at the same time ensures that bigger 
    chunks of data are sent when actually sending and thus decreasing 
    the operating system overhead.

--- 1.67/storage/ndb/src/ndbapi/NdbTransaction.cpp	2006-12-04 09:55:17 +01:00
+++ 1.68/storage/ndb/src/ndbapi/NdbTransaction.cpp	2006-12-04 09:55:17 +01:00
@@ -540,8 +540,10 @@ NdbTransaction::executeAsynchPrepare( Ex
   /**
    * Reset error.code on execute
    */
+#ifndef DBUG_OFF
   if (theError.code != 0)
     DBUG_PRINT("enter", ("Resetting error %d on execute", theError.code));
+#endif
   theError.code = 0;
   NdbScanOperation* tcOp = m_theFirstScanOperation;
   if (tcOp != 0){

--- 1.65/storage/ndb/src/ndbapi/NdbDictionary.cpp	2006-12-04 09:55:17 +01:00
+++ 1.66/storage/ndb/src/ndbapi/NdbDictionary.cpp	2006-12-04 09:55:17 +01:00
@@ -1513,7 +1513,7 @@ NdbDictionary::Dictionary::recAddAttrNot
 Uint32 *
 NdbDictionary::Dictionary::getRecAttrSet(const char *tableName, NdbRecord *rec)
 {
-  m_impl.getRecAttrSet(tableName, rec);
+  return m_impl.getRecAttrSet(tableName, rec);
 }
 
 void 

--- 1.70/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2006-12-04 09:55:17 +01:00
+++ 1.71/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2006-12-04 09:55:17 +01:00
@@ -579,13 +579,13 @@ public:
 
   enum Flags
   {
-    IsPK= 1,
+    IsPK= 1
   };
 
   enum RecAttrTypes
   {
     AttrUnused= 0,
-    AttrNotNULL,
+    AttrNotNULL
   };
 
   struct Attr

--- 1.22/storage/ndb/src/ndbapi/NdbOperationExec.cpp	2006-12-04 09:55:17 +01:00
+++ 1.23/storage/ndb/src/ndbapi/NdbOperationExec.cpp	2006-12-04 09:55:17 +01:00
@@ -383,6 +383,9 @@ NdbOperation::prepareSendInterpreted()
     return -1;
   }
 
+  /*
+    Fix jumps by patching in the correct address for the corresponding label.
+  */
   while (theFirstBranch != NULL) {
     Uint32 tRelAddress;
     Uint32 tLabelAddress = 0;

--- 1.14/storage/ndb/test/ndbapi/flexBench.cpp	2006-12-04 09:55:17 +01:00
+++ 1.15/storage/ndb/test/ndbapi/flexBench.cpp	2006-12-04 09:55:17 +01:00
@@ -660,8 +660,8 @@ static void* flexBenchThread(void* pArg)
       tResult = 13;
       goto end;
     }
-    for (Uint32 col= 0; col<tNoOfAttributes; col++)
-      dict->recAddAttrNotNULL(tableName[tab], pRec[tab], col+firstCol,
sizeof(int)*tAttributeSize*col);
+    for (Uint32 col= 1; col<tNoOfAttributes; col++)
+      dict->recAddAttrNotNULL(tableName[tab], pRec[tab], col-1+firstCol,
sizeof(int)*tAttributeSize*col);
     if (useLongKeys)
     {
       for (Uint32 col= 0; col<tNoOfLongPK; col++)