bk commit into 5.1 tree (tomas:1.1960) BUG#16125

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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.1960 06/01/02 15:27:43 tomas@stripped +2 -0
  bug#15908, bug#16125

  storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
    1.81 06/01/02 15:27:34 tomas@stripped +1 -0
    bug#15908, bug#16125

  storage/ndb/include/util/Bitmask.hpp
    1.18 06/01/02 15:27:34 tomas@stripped +2 -2
    bug#15908, bug#16125

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-5.0

--- 1.17/storage/ndb/include/util/Bitmask.hpp	2005-04-08 02:43:54 +02:00
+++ 1.18/storage/ndb/include/util/Bitmask.hpp	2006-01-02 15:27:34 +01:00
@@ -814,7 +814,7 @@
 BitmaskImpl::getField(unsigned size, const Uint32 src[],
 		      unsigned pos, unsigned len, Uint32 dst[])
 {
-  assert(pos + len < (size << 5));
+  assert(pos + len <= (size << 5));
   
   src += (pos >> 5);
   Uint32 offset = pos & 31;
@@ -833,7 +833,7 @@
 BitmaskImpl::setField(unsigned size, Uint32 dst[],
 		      unsigned pos, unsigned len, const Uint32 src[])
 {
-  assert(pos + len < (size << 5));
+  assert(pos + len <= (size << 5));
 
   dst += (pos >> 5);
   Uint32 offset = pos & 31;

--- 1.80/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2005-10-07 10:58:01 +02:00
+++ 1.81/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2006-01-02 15:27:34 +01:00
@@ -9266,6 +9266,7 @@
 // completion. Signal completion through scanCompletedStatus-flag.
 /*---------------------------------------------------------------------------*/
     scanptr.p->scanCompletedStatus = ZTRUE;
+    scanptr.p->scanState = ScanRecord::WAIT_LQHKEY_COPY;
     return;
   }//if