From: jonas
Date: December 14 2005 10:11am
Subject: bk commit into 5.1 tree (jonas:1.1963)
List-Archive: http://lists.mysql.com/commits/142
Message-Id: <20051214101100.EB588227920@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
  1.1963 05/12/14 11:10:56 jonas@stripped +1 -0
  Merge joreland@stripped:/home/bk/mysql-5.1-new
  into  perch.ndb.mysql.com:/home/jonas/src/mysql-5.1-new

  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
    1.97 05/12/14 11:10:52 jonas@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:	jonas
# Host:	perch.ndb.mysql.com
# Root:	/home/jonas/src/mysql-5.1-new/RESYNC

--- 1.96/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2005-12-13 21:56:12 +01:00
+++ 1.97/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2005-12-14 11:10:52 +01:00
@@ -2314,7 +2314,10 @@
   {
     keyPartLenPtr = keyPartLen;
     dstPos = xfrm_key(tabPtrI, src, dst, sizeof(Tmp) >> 2, keyPartLenPtr);
-    ndbrequire(dstPos);
+    if (unlikely(dstPos == 0))
+    {
+      goto error;
+    }
   } 
   else 
   {
@@ -2335,6 +2338,10 @@
     dstHash[1] = tmp[1];
   }
   return true;  // success
+
+error:
+  terrorCode = ZINVALID_KEY;
+  return false;
 }
 
 /*
@@ -2944,7 +2951,15 @@
   UintR tnoOfStandby;
   UintR tnodeinfo;
 
+  terrorCode = 0;
+
   hash(signal); /* NOW IT IS TIME TO CALCULATE THE HASH VALUE*/
+  
+  if (unlikely(terrorCode))
+  {
+    releaseAtErrorLab(signal);
+    return;
+  }
 
   CacheRecord * const regCachePtr = cachePtr.p;
   TcConnectRecord * const regTcPtr = tcConnectptr.p;