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

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0-falcon 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-06-12 17:05:15-04:00, jas@rowvwade. +3 -0
  Fix table space bootstrap problem.

  storage/falcon/Database.cpp@stripped, 2007-06-12 17:04:58-04:00, jas@rowvwade. +3 -0
    Fix double reporting of serial log activity.

  storage/falcon/Dbb.cpp@stripped, 2007-06-12 17:04:58-04:00, jas@rowvwade. +0 -3
    Fix double reporting of serial log activity.

  storage/falcon/TableSpaceManager.cpp@stripped, 2007-06-12 17:04:59-04:00, jas@rowvwade. +1 -0
    Fix table space bootstrap problem.

# 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:	rowvwade.
# Root:	D:/MySQL/mysql-5.1-falcon

--- 1.8/storage/falcon/TableSpaceManager.cpp	2007-06-12 17:05:40 -04:00
+++ 1.9/storage/falcon/TableSpaceManager.cpp	2007-06-12 17:05:40 -04:00
@@ -193,6 +193,7 @@
 		TableSpace *tableSpace = new TableSpace(database, name.getString(), id.getInt(),
fileName.getString());
 		tableSpace->open();
 		add(tableSpace);
+		stream.clear();
 		}
 }
 

--- 1.73/storage/falcon/Database.cpp	2007-06-12 17:05:40 -04:00
+++ 1.74/storage/falcon/Database.cpp	2007-06-12 17:05:40 -04:00
@@ -1665,6 +1665,9 @@
 	//dbb->reportStatistics();
 	tableSpaceManager->reportStatistics();
 	repositoryManager->reportStatistics();
+
+	if (serialLog)
+		serialLog->logInfo();
 }
 
 

--- 1.75/storage/falcon/Dbb.cpp	2007-06-12 17:05:40 -04:00
+++ 1.76/storage/falcon/Dbb.cpp	2007-06-12 17:05:40 -04:00
@@ -1086,9 +1086,6 @@
 	Log::log (LogInfo, "Activity on %s: %d fetches, %d reads, %d writes\n",
 				(const char*) fileName, deltaFetches, deltaReads, deltaWrites);
 	
-	if (serialLog)
-		serialLog->logInfo();
-		
 	priorReads = reads;
 	priorWrites = writes;
 	priorFetches = fetches;