bk commit into 4.1 tree (joreland:1.2167)

[jonas.oreland]

Below is the list of changes that have just been committed into a local
4.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
  1.2167 05/04/08 14:16:57 joreland@stripped +1 -0
  Merge joreland@stripped:/home/bk/mysql-4.1
  into mysql.com:/home/jonas/src/mysql-4.1

  ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.27 05/04/08 14:16:55 joreland@stripped +0 -0
    Auto merged

# 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:	joreland
# Host:	eel.ndb.mysql.com.ndb.mysql.com.ndb.mysql.com.ndb.mysql.com
# Root:	/home/jonas/src/mysql-4.1/RESYNC

--- 1.26/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	Tue Mar 29 12:00:41 2005
+++ 1.27/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	Fri Apr  8 14:16:55 2005
@@ -2522,6 +2522,26 @@
     *sig = *req;
     return;
   }
+  operationRecPtr.i = req->accOpPtr;
+  ptrCheckGuard(operationRecPtr, coprecsize, operationrec);
+  fragrecptr.i = operationRecPtr.p->fragptr;
+  ptrCheckGuard(fragrecptr, cfragmentsize, fragmentrec);
+  if (fragrecptr.p->keyLength == 0 &&
+      // should test some state variable
+      operationRecPtr.p->elementPage != RNIL) {
+    jam();
+    // re-compute long key vars
+    Page8Ptr tPageptr;
+    tPageptr.i = operationRecPtr.p->elementPage;
+    ptrCheckGuard(tPageptr, cpagesize, page8);
+    Uint32 tKeyptr =
+      operationRecPtr.p->elementPointer +
+      operationRecPtr.p->elementIsforward *
+      (ZELEM_HEAD_SIZE + fragrecptr.p->localkeylen);
+    tslcPageIndex = tPageptr.p->word32[tKeyptr] & 0x3ff;
+    tslcPagedir = tPageptr.p->word32[tKeyptr] >> 10;
+    searchLongKey(signal, false);
+  }
   if (lockOp == AccLockReq::Unlock) {
     jam();
     // do unlock via ACC_COMMITREQ (immediate)