bk commit into 6.0 tree (jas:1.2623)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0 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, 2008-04-05 14:38:49-04:00, jas@rowvwade. +5 -0
  Do autocommits when building an index.  Also force comprehensive
  record scavenge under emergency conditions.  Also, skip loading of
  extended tablespace attributes during tablespace bootstrap for
  backwards compatibility.

  storage/falcon/Database.cpp@stripped, 2008-04-05 14:38:37-04:00, jas@rowvwade. +1 -1
    Passed "forced scavenge" bit to the record scavenger to force
    a comprehensive scavenge under emergency conditions.

  storage/falcon/RecordScavenge.cpp@stripped, 2008-04-05 14:38:38-04:00, jas@rowvwade. +3 -2
    Passed "forced scavenge" bit to the record scavenger to force
    a comprehensive scavenge under emergency conditions.

  storage/falcon/RecordScavenge.h@stripped, 2008-04-05 14:38:38-04:00, jas@rowvwade. +2 -1
    Passed "forced scavenge" bit to the record scavenger to force
    a comprehensive scavenge under emergency conditions.

  storage/falcon/TableSpaceManager.cpp@stripped, 2008-04-05 14:38:39-04:00, jas@rowvwade. +2
-0
    Don't try to access extended table space attributes during
    tablespace bootstrap operation.

  storage/falcon/ha_falcon.cpp@stripped, 2008-04-05 14:38:39-04:00, jas@rowvwade. +1 -0
    Do 10,000 record auto-commits during "create index" operations.

diff -Nrup a/storage/falcon/Database.cpp b/storage/falcon/Database.cpp
--- a/storage/falcon/Database.cpp	2008-03-30 03:24:27 -04:00
+++ b/storage/falcon/Database.cpp	2008-04-05 14:38:37 -04:00
@@ -1773,7 +1773,7 @@ void Database::retireRecords(bool forced
 	TransId oldestActiveTransaction = transactionManager->findOldestActive();
 	int threshold = 0;
 	uint64 total = recordDataPool->activeMemory;
-	RecordScavenge recordScavenge(this, oldestActiveTransaction);
+	RecordScavenge recordScavenge(this, oldestActiveTransaction, forced);
 	
 	// If we passed the upper limit, scavenge.  If we didn't pick up
 	// a significant amount of memory since the last cycle, don't bother
diff -Nrup a/storage/falcon/RecordScavenge.cpp b/storage/falcon/RecordScavenge.cpp
--- a/storage/falcon/RecordScavenge.cpp	2007-10-16 13:16:25 -04:00
+++ b/storage/falcon/RecordScavenge.cpp	2008-04-05 14:38:38 -04:00
@@ -22,10 +22,11 @@
 #include "MemMgr.h"
 
 
-RecordScavenge::RecordScavenge(Database *db, TransId oldestTransaction)
+RecordScavenge::RecordScavenge(Database *db, TransId oldestTransaction, bool forced)
 {
 	database = db;
 	transactionId = oldestTransaction;
+	wasForced = forced;
 	baseGeneration = database->currentGeneration;
 	memset(ageGroups, 0, sizeof(ageGroups));
 	recordsReclaimed = 0;
@@ -78,7 +79,7 @@ int RecordScavenge::computeThreshold(uin
 
 	totalSpace += overflowSpace;
 
-	if (scavengeGeneration == 0 && totalSpace > target)
+	if (wasForced || (scavengeGeneration == 0 && totalSpace > target))
 		scavengeGeneration = baseGeneration + AGE_GROUPS;
 	
 	return scavengeGeneration;
diff -Nrup a/storage/falcon/RecordScavenge.h b/storage/falcon/RecordScavenge.h
--- a/storage/falcon/RecordScavenge.h	2008-03-30 03:24:27 -04:00
+++ b/storage/falcon/RecordScavenge.h	2008-04-05 14:38:38 -04:00
@@ -39,8 +39,9 @@ public:
 	uint64		overflowSpace;
 	uint64		totalSpace;
 	uint64		recordSpace;
+	bool		wasForced;
 	
-	RecordScavenge(Database *db, TransId oldestTransaction);
+	RecordScavenge(Database *db, TransId oldestTransaction, bool forced);
 	~RecordScavenge(void);
 
 	void		inventoryRecord(Record* record);
diff -Nrup a/storage/falcon/TableSpaceManager.cpp b/storage/falcon/TableSpaceManager.cpp
--- a/storage/falcon/TableSpaceManager.cpp	2008-03-31 18:00:58 -04:00
+++ b/storage/falcon/TableSpaceManager.cpp	2008-04-05 14:38:39 -04:00
@@ -217,6 +217,7 @@ void TableSpaceManager::bootstrap(int se
 		p = EncodedDataStream::decode(p, &id, true);
 		p = EncodedDataStream::decode(p, &fileName, true);
 		p = EncodedDataStream::decode(p, &type, true);
+		/***
 		p = EncodedDataStream::decode(p, &allocation, true);
 		p = EncodedDataStream::decode(p, &extent, true);
 		p = EncodedDataStream::decode(p, &autoExtend, true);
@@ -224,6 +225,7 @@ void TableSpaceManager::bootstrap(int se
 		p = EncodedDataStream::decode(p, &nodegroup, true);
 		p = EncodedDataStream::decode(p, &wait, true);
 		p = EncodedDataStream::decode(p, &comment, true);
+		***/
 		
 		TableSpaceInit tsInit;
 		tsInit.allocation	= allocation.getQuad();
diff -Nrup a/storage/falcon/ha_falcon.cpp b/storage/falcon/ha_falcon.cpp
--- a/storage/falcon/ha_falcon.cpp	2008-04-01 11:08:41 -04:00
+++ b/storage/falcon/ha_falcon.cpp	2008-04-05 14:38:39 -04:00
@@ -1065,6 +1065,7 @@ int StorageInterface::write_row(uchar *b
 			case SQLCOM_LOAD:
 			case SQLCOM_ALTER_TABLE:
 			case SQLCOM_CREATE_TABLE:
+			case SQLCOM_CREATE_INDEX:
 				storageHandler->commit(mySqlThread);
 				storageConnection->startTransaction(getTransactionIsolation(mySqlThread));
 				storageConnection->markVerb();