bk commit into 5.0 tree (jonas:1.2233) BUG#19852

[jonas]

Below is the list of changes that have just been committed into a local
5.0 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-08-03 14:46:11+02:00, jonas@stripped +1 -0
  ndb - bug#20892
    Correction of bug#19852 (that also revealed another bug)
    Do grow noOfPagesToGrow with more than was actually allocated

  ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp@stripped, 2006-08-03 14:46:09+02:00,
jonas@stripped +2 -2
    Dont grow "noOfPagesToGrow" with more than was actually allocated
      (as it will then grow indefinitly)

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

--- 1.2/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp	2006-08-03 14:46:14 +02:00
+++ 1.3/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp	2006-08-03 14:46:14 +02:00
@@ -397,12 +397,12 @@
   Uint32 noAllocPages = regFragPtr->noOfPagesToGrow >> 3; // 12.5%
   noAllocPages += regFragPtr->noOfPagesToGrow >> 4; // 6.25%
   noAllocPages += 2;
-  regFragPtr->noOfPagesToGrow += noAllocPages;
 /* -----------------------------------------------------------------*/
 // We will grow by 18.75% plus two more additional pages to grow
 // a little bit quicker in the beginning.
 /* -----------------------------------------------------------------*/
-  allocFragPages(regFragPtr, noAllocPages);
+  Uint32 allocated = allocFragPages(regFragPtr, noAllocPages);
+  regFragPtr->noOfPagesToGrow += allocated;
 }//Dbtup::allocMoreFragPages()
 
 Uint32 Dbtup::leafPageRangeFull(Fragrecord*  const regFragPtr, PageRangePtr
currPageRangePtr)