bk commit into 6.0 tree (jas:1.2655)

[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, 2007-10-16 11:12:27-04:00, jas@rowvwade. +1 -0
  Fix scavenge time reporting.

  storage/falcon/Database.cpp@stripped, 2007-10-16 11:12:20-04:00, jas@rowvwade. +2 -2
    Fix scavenge time reporting.

diff -Nrup a/storage/falcon/Database.cpp b/storage/falcon/Database.cpp
--- a/storage/falcon/Database.cpp	2007-10-16 10:05:58 -04:00
+++ b/storage/falcon/Database.cpp	2007-10-16 11:12:20 -04:00
@@ -1668,7 +1668,7 @@ void Database::retireRecords(bool forced
 		Sync syncTbl (&syncTables, "Database::retireRecords");
 		syncTbl.lock (Shared);
 		Table *table;
-		time_t start = deltaTime;
+		time_t scavengeStart = deltaTime;
 		
 		for (table = tableList; table; table = table->next)
 			table->inventoryRecords(&recordScavenge);
@@ -1699,7 +1699,7 @@ void Database::retireRecords(bool forced
 
 		syncTbl.unlock();
 		Log::log(LogScavenge, "%d: Scavenged %d records, " I64FORMAT " bytes in %d seconds\n", 
-					deltaTime, recordScavenge.recordsReclaimed, recordScavenge.spaceReclaimed, deltaTime
- startTime);
+					deltaTime, recordScavenge.recordsReclaimed, recordScavenge.spaceReclaimed, deltaTime
- scavengeStart);
 			
 		total = recordScavenge.spaceRemaining;
 		}