bk commit into 5.1 tree (jonas:1.2383)

[jonas]

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.2383 06/06/01 14:36:53 jonas@stripped +1 -0
  ndb - acc -
    add assertion

  storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
    1.72 06/06/01 14:36:49 jonas@stripped +1 -0
    Add assertion that we dont try to read key from lqh on scan (as it does not have key...)

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

--- 1.71/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2006-06-01 09:42:46 +02:00
+++ 1.72/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2006-06-01 14:36:49 +02:00
@@ -3190,6 +3190,7 @@ Dbacc::readTablePk(Uint32 localkey1, Uin
   else
   {
     ndbrequire(ElementHeader::getLocked(eh));
+    ndbrequire((op->m_op_bits & Operationrec::OP_MASK) != ZSCAN_OP);
     ret = c_lqh->readPrimaryKeys(op->userptr, ckeys, xfrm);
   }
   jamEntry();