bk commit into 6.0 tree (jas:1.2768)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0 repository of . When  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, 2008-01-02 17:38:12-05:00, jas@rowvwade. +1 -0
  Fix another path that would return with BDB locked if
  taken.  (The original code was an in-line repair for
  an earlier bug, and should otherwise not be executed.

  storage/falcon/Section.cpp@stripped, 2008-01-02 17:38:04-05:00, jas@rowvwade. +1 -1
    Fix another path that would return with BDB locked if
    taken.

diff -Nrup a/storage/falcon/Section.cpp b/storage/falcon/Section.cpp
--- a/storage/falcon/Section.cpp	2008-01-02 15:12:45 -05:00
+++ b/storage/falcon/Section.cpp	2008-01-02 17:38:04 -05:00
@@ -638,7 +638,7 @@ int Section::deleteLine(Bdb * bdb, int l
 	for (int n = 0; n < locatorPage->maxLine; ++n)
 		if (n != locatorLine && locatorPage->elements[n].page == bdb->pageNumber)
 			{
-			//ASSERT(false);
+			bdb->release(REL_HISTORY);
 			Log::debug("Section::deleteLine -- locator page %d line %d points to empty data page %d:%d\n",
 						sectionPageNumber, n, locatorPage->elements[n].page, locatorPage->elements[n].line);