bk commit into 5.0 tree (jonas:1.2474)

[jonas]

Below is the list of changes that have just been committed into a local
5.0 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-08 12:57:37+02:00, jonas@stripped +1 -0
  Merge perch.ndb.mysql.com:/home/jonas/src/50-work
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-ndb
  MERGE: 1.2216.71.62

  ndb/src/kernel/blocks/dblqh/DblqhMain.cpp@stripped, 2007-05-08 12:57:33+02:00,
jonas@stripped +0 -0
    Auto merged
    MERGE: 1.97.2.6

# 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/mysql-5.0-ndb/RESYNC

--- 1.105/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-05-08 12:57:43 +02:00
+++ 1.106/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2007-05-08 12:57:43 +02:00
@@ -3337,7 +3337,7 @@
   locTcConnectptr.p->tableref = RNIL;
   locTcConnectptr.p->savePointId = 0;
 #ifdef VM_TRACE
-  locTcConnectptr.p->tupkeyref = 0;
+  locTcConnectptr.p->tupkeyref = 1;
 #endif
 
   cfirstfreeTcConrec = nextTc;
@@ -4059,6 +4059,9 @@
   tupKeyReq->tcOpIndex = tcConnectptr.p->tcOprec;
   tupKeyReq->savePointId = tcConnectptr.p->savePointId;
 
+#ifdef VM_TRACE
+  tcConnectptr.p->tupkeyref = 0;
+#endif
   EXECUTE_DIRECT(tup, GSN_TUPKEYREQ, signal, TupKeyReq::SignalLength);
 }//Dblqh::execACCKEYCONF()
 
@@ -5871,7 +5874,7 @@
 {
   jam();
 #ifdef VM_TRACE
-  locTcConnectptr.p->tupkeyref = 0;
+  locTcConnectptr.p->tupkeyref = 1;
 #endif
 
   locTcConnectptr.p->tcTimer = 0;
@@ -5897,7 +5900,7 @@
 {
   jam();
 #ifdef VM_TRACE
-  locTcConnectptr.p->tupkeyref = 0;
+  locTcConnectptr.p->tupkeyref = 1;
 #endif
   locTcConnectptr.p->tcTimer = 0;
   locTcConnectptr.p->transactionState = TcConnectionrec::TC_NOT_CONNECTED;
@@ -8353,8 +8356,11 @@
     tupKeyReq->tcOpIndex = tcConnectptr.p->tcOprec;
     tupKeyReq->savePointId = tcConnectptr.p->savePointId;
     Uint32 blockNo = refToBlock(tcConnectptr.p->tcTupBlockref);
+#ifdef VM_TRACE
+    tcConnectptr.p->tupkeyref = 0;
+#endif
     EXECUTE_DIRECT(blockNo, GSN_TUPKEYREQ, signal, 
-               TupKeyReq::SignalLength);
+                   TupKeyReq::SignalLength);
   }
 }
 
@@ -9472,6 +9478,9 @@
     tupKeyReq->tcOpIndex = tcConnectptr.p->tcOprec;
     tupKeyReq->savePointId = tcConnectptr.p->savePointId;
     Uint32 blockNo = refToBlock(tcConnectptr.p->tcTupBlockref);
+#ifdef VM_TRACE
+    tcConnectptr.p->tupkeyref = 0;
+#endif
     EXECUTE_DIRECT(blockNo, GSN_TUPKEYREQ, signal, 
                TupKeyReq::SignalLength);
   }