bk commit into 5.1 tree (knielsen:1.2344)

[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:58:12+01:00, knielsen@ymer.(none) +3 -0
  Merge bk-internal:/home/bk/mysql-5.1-new-ndb
  into  ymer.(none):/usr/local/mysql/mysql-5.1-wl2223
  MERGE: 1.2321.1.5

  storage/ndb/src/ndbapi/NdbDictionary.cpp@stripped, 2006-12-04 09:58:05+01:00,
knielsen@ymer.(none) +0 -0
    Auto merged
    MERGE: 1.64.1.1

  storage/ndb/src/ndbapi/NdbOperationExec.cpp@stripped, 2006-12-04 09:58:05+01:00,
knielsen@ymer.(none) +0 -0
    Auto merged
    MERGE: 1.22.1.1

  storage/ndb/src/ndbapi/NdbTransaction.cpp@stripped, 2006-12-04 09:58:05+01:00,
knielsen@ymer.(none) +0 -0
    Auto merged
    MERGE: 1.66.1.3

# 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/RESYNC

--- 1.68/storage/ndb/src/ndbapi/NdbTransaction.cpp	2006-12-04 09:58:26 +01:00
+++ 1.69/storage/ndb/src/ndbapi/NdbTransaction.cpp	2006-12-04 09:58:26 +01:00
@@ -534,8 +534,8 @@ NdbTransaction::executeAsynchPrepare( Ex
                                      AbortOption abortOption)
 {
   DBUG_ENTER("NdbTransaction::executeAsynchPrepare");
-  DBUG_PRINT("enter", ("aTypeOfExec: %d, aCallback: %x, anyObject: %x", 
-		       aTypeOfExec, aCallback, anyObject));
+  DBUG_PRINT("enter", ("aTypeOfExec: %d, aCallback: 0x%lx, anyObject: Ox%lx",
+		       aTypeOfExec, (long) aCallback, (long) anyObject));
 
   /**
    * Reset error.code on execute
@@ -929,7 +929,10 @@ NdbTransaction::release(){
      *	The user did not perform any rollback but simply closed the
      *      transaction. We must rollback Ndb since Ndb have been contacted.
      ************************************************************************/
-    execute(Rollback);
+    if (!theSimpleState)
+    {
+      execute(Rollback);
+    }
   }//if
   theMagicNumber = 0xFE11DC;
   theInUseState = false;
@@ -1013,7 +1016,7 @@ void 
 NdbTransaction::releaseExecutedScanOperation(NdbIndexScanOperation* cursorOp)
 {
   DBUG_ENTER("NdbTransaction::releaseExecutedScanOperation");
-  DBUG_PRINT("enter", ("this=0x%x op=0x%x", (UintPtr)this, (UintPtr)cursorOp));
+  DBUG_PRINT("enter", ("this: 0x%lx  op: 0x%lx", (long) this, (long) cursorOp));
   
   releaseScanOperation(&m_firstExecutedScanOp, 0, cursorOp);
   
@@ -1973,8 +1976,10 @@ NdbTransaction::receiveTCINDXCONF(const 
     if (tCommitFlag == 1) {
       theCommitStatus = Committed;
       theGlobalCheckpointId = tGCI;
-      assert(tGCI);
-      *p_latest_trans_gci = tGCI;
+      if (tGCI) // Read(dirty) only transaction doesnt get GCI
+      {
+	*p_latest_trans_gci = tGCI;
+      }
     } else if ((tNoComp >= tNoSent) &&
                (theLastExecOpInList->theCommitIndicator == 1)){
       /**********************************************************************/

--- 1.66/storage/ndb/src/ndbapi/NdbDictionary.cpp	2006-12-04 09:58:26 +01:00
+++ 1.67/storage/ndb/src/ndbapi/NdbDictionary.cpp	2006-12-04 09:58:26 +01:00
@@ -204,7 +204,7 @@ NdbDictionary::Column::getPrimaryKey() c
 
 void 
 NdbDictionary::Column::setPartitionKey(bool val){
-  m_impl.m_distributionKey = true;
+  m_impl.m_distributionKey = val;
 }
 
 bool 

--- 1.23/storage/ndb/src/ndbapi/NdbOperationExec.cpp	2006-12-04 09:58:26 +01:00
+++ 1.24/storage/ndb/src/ndbapi/NdbOperationExec.cpp	2006-12-04 09:58:26 +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;