bk commit into 6.0-falcon tree (jas:1.2726)

[Jim Starkey]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of jas. When jas 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-08-30 13:36:34-04:00, jas@stripped +2 -0
  Prevent IndexNode::parseNode from running away on the last
  node of a page.

  storage/falcon/IndexPage.cpp@stripped, 2007-08-30 13:36:30-04:00, jas@stripped +3 -9
    Prevent IndexNode::parseNode from running away on the last
    node of a page.

  storage/falcon/Makefile.am@stripped, 2007-08-30 13:36:30-04:00, jas@stripped +1 -1
    Eliminate -DMEM_DEBUG

# 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:	jas
# Host:	fluffy.netfrastructure.com
# Root:	/home/mysql/mysql-5.1-falcon

--- 1.61/storage/falcon/IndexPage.cpp	2007-08-30 13:36:41 -04:00
+++ 1.62/storage/falcon/IndexPage.cpp	2007-08-30 13:36:41 -04:00
@@ -989,15 +989,9 @@
 	Btn *end = (Btn*)((char*) this + length);
 	IndexNode node(this);
 
-	if (node.node < end)
-		for (;; node.getNext(end))
-			{
-			node.expandKey(&key);
-			
-			if (node.nextNode >= end)
-				break;
-			}
-
+	for (; node.node < end; node.getNext(end))
+		node.expandKey(&key);
+		
 	int offset = computePrefix(newKey, &key);
 
 	if (length + (int) newKey->keyLength - offset >= pageSize)

--- 1.64/storage/falcon/Makefile.am	2007-08-30 13:36:41 -04:00
+++ 1.65/storage/falcon/Makefile.am	2007-08-30 13:36:41 -04:00
@@ -19,7 +19,7 @@
 CXXFLAGS= @CXXFLAGS@ -fimplicit-templates -fexceptions @CXXFLAGS_NO_WARN_OFFSETOF@
 
 DEFS= @DEFS@ \
-      -D_REENTRANT -D_PTHREADS -DENGINE -DSTORAGE_ENGINE -DNAMESPACE=Nfs -DMEM_DEBUG
+      -D_REENTRANT -D_PTHREADS -DENGINE -DSTORAGE_ENGINE -DNAMESPACE=Nfs 
 
 INCLUDES= -I$(top_srcdir)/include -I$(top_builddir)/include \
 	  -I$(top_srcdir)/regex -I$(top_srcdir)/sql \