From: Date: December 1 2006 8:54am
Subject: bk commit into 5.1 tree (jonas:1.2333) BUG#24476
List-Archive: http://lists.mysql.com/commits/16274
X-Bug: 24476
Message-Id: <20061201075433.93967631DCE@perch.ndb.mysql.com>

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, 2006-12-01 08:54:28+01:00, jonas@stripped +1 -0
  ndb - bug#24476
    Fix typo that yeilded rare crash in ACC

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp@stripped, 2006-12-01 08:54:27+01:00, jonas@stripped +3 -2
    fix typo, where elementptr was sent as elementheader
    yeilded very rare crashes as only 1 bit is checked
      and it's only checked under certatin rare circumstances

# 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-work

--- 1.77/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2006-12-01 08:54:33 +01:00
+++ 1.78/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2006-12-01 08:54:33 +01:00
@@ -3337,9 +3337,10 @@
           bool found;
           if (! searchLocalKey) 
 	  {
-            Uint32 len = readTablePk(localkey1, tgeElementptr, lockOwnerPtr.p);
+            Uint32 len = readTablePk(localkey1, tgeElementHeader, 
+				     lockOwnerPtr.p);
             found = (len == operationRecPtr.p->xfrmtupkeylen) &&
-                    (memcmp(Tkeydata, ckeys, len << 2) == 0);
+	      (memcmp(Tkeydata, ckeys, len << 2) == 0);
           } else {
             jam();
             found = (localkey1 == Tkeydata[0]);