bk commit into 5.1 tree (tomas:1.2563)

[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@stripped, 2007-06-19 00:44:25+02:00, tomas@stripped +2 -0
  bump up version
  check also in release getRealpid logical page id out of bounds

  cluster_change_hist.txt@stripped, 2007-06-19 00:44:22+02:00, tomas@stripped
+5 -0
    bump up version

  storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp@stripped, 2007-06-19 00:44:23+02:00,
tomas@stripped +1 -1
    check also in release

# 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:	whalegate.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-telco-6.1

--- 1.27/cluster_change_hist.txt	2007-06-15 11:22:43 +02:00
+++ 1.28/cluster_change_hist.txt	2007-06-19 00:44:22 +02:00
@@ -2,6 +2,11 @@
 mysql-5.1.15-ndb-6.1.X
 ==================================================
 
+mysql-5.1.15-ndb-6.1.14 (2007-06-xx)
+
+  Bug #29176 missing stack pruning in drop_page
+  Bug #29167 Insufficient nodes for SR
+
 mysql-5.1.15-ndb-6.1.13 (2007-06-15)
 
   Bug #29099 slow backup for disk data

--- 1.13/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp	2007-06-12 10:35:19 +02:00
+++ 1.14/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp	2007-06-19 00:44:23 +02:00
@@ -113,7 +113,7 @@
   Uint32 loopLimit;
   Uint32 loopCount = 0;
   Uint32 pageRangeLimit = cnoOfPageRangeRec;
-  ndbassert(logicalPageId < getNoOfPages(regFragPtr));
+  ndbrequire(logicalPageId < getNoOfPages(regFragPtr));
   grpPageRangePtr.i = regFragPtr->rootPageRange;
   while (true) {
     ndbassert(loopCount++ < 100);