bzr push into mysql-6.0-falcon-team branch (christopher.powers:3058)

[Christopher Powers]

 3058 Christopher Powers	2009-03-09 [merge]
      merge
modified:
  storage/falcon/IndexRootPage.cpp

=== modified file 'storage/falcon/Database.cpp'
--- a/storage/falcon/Database.cpp	2009-03-03 07:09:29 +0000
+++ b/storage/falcon/Database.cpp	2009-03-09 12:12:14 +0000
@@ -1840,6 +1840,9 @@ void Database::scavengeRecords(bool forc
 	recordScavenge.retiredActiveMemory = recordMemoryControl->getCurrentMemory(MemMgrRecordData);
 	recordScavenge.retireStop = deltaTime;
 
+	// Backlogging disabled: Bug#43504 "Falcon DBT2 crash in Table::rollbackRecord()"
+
+#if 0 
 	// Enable backlogging if memory is low
 
 	if (recordScavenge.retiredActiveMemory > recordScavengeFloor)
@@ -1851,6 +1854,7 @@ void Database::scavengeRecords(bool forc
 			if (--lowMemoryCount == 0)
 				clearLowMemory();
 		}
+#endif	
 
 	recordScavenge.print();
 	// Log::log(analyze(analyzeRecordLeafs));

=== modified file 'storage/falcon/Table.cpp'
--- a/storage/falcon/Table.cpp	2009-03-07 01:37:19 +0000
+++ b/storage/falcon/Table.cpp	2009-03-09 12:12:14 +0000
@@ -3666,9 +3666,6 @@ RecordVersion* Table::allocRecordVersion
 		{
 		try
 			{
-			if ((++database->recordPoolAllocCount & 0x7F) == 0)
-				database->checkRecordScavenge();
-
 			return POOL_NEW(database->recordVersionPool) RecordVersion(this, format, transaction, priorVersion);
 			}
 
@@ -3703,9 +3700,6 @@ Record* Table::allocRecord(int recordNum
 		{
 		try
 			{
-			if ((++database->recordPoolAllocCount & 0x7F) == 0)
-				database->checkRecordScavenge();
-
 			return POOL_NEW(database->recordPool) Record (this, recordNumber, stream);
 			}