bk commit into 6.0-falcon tree (hakank:1.2641)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0-falcon repository of hakan. When hakan 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-07-18 09:43:44+02:00, hakank@stripped +2 -0
  Make gcc happy.

  storage/falcon/SRLSectionLine.cpp@stripped, 2007-07-18 09:43:40+02:00,
hakank@stripped +4 -3
    Make gcc happy.

  storage/falcon/Section.cpp@stripped, 2007-07-18 09:43:40+02:00, hakank@stripped
+1 -1
    Make gcc happy.

# 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:	hakank
# Host:	lu0011.wdf.sap.corp
# Root:	/home/hakan/work/mysql/mysql-5.1-falcon

--- 1.10/storage/falcon/SRLSectionLine.cpp	2007-07-12 00:17:45 +02:00
+++ 1.11/storage/falcon/SRLSectionLine.cpp	2007-07-18 09:43:40 +02:00
@@ -60,11 +60,12 @@
 
 void SRLSectionLine::pass2(void)
 {
-	bool dataPageActive = log->bumpPageIncarnation(dataPageNumber, tableSpaceId,
objInUse); 
-	
+	// bool dataPageActive =
+	log->bumpPageIncarnation(dataPageNumber, tableSpaceId, objInUse);
+
 	if (log->bumpPageIncarnation(pageNumber, tableSpaceId, objInUse))
 		Section::redoSectionLine(log->getDbb(tableSpaceId), pageNumber, dataPageNumber);
-	
+
 }
 
 void SRLSectionLine::redo(void)

--- 1.59/storage/falcon/Section.cpp	2007-07-12 00:17:46 +02:00
+++ 1.60/storage/falcon/Section.cpp	2007-07-18 09:43:40 +02:00
@@ -543,7 +543,7 @@
 	bdb->mark(transId);
 	DataPage *page = (DataPage*) bdb->buffer;
 	//validate(locatorPage, bdb);
-	int maxLine = page->maxLine;
+	// int maxLine = page->maxLine;
 	int spaceAvailable = page->deleteLine(dbb, line, transId);
 	
 	// Unless the page is empty, return the amount of space remaining