bzr commit into mysql-6.0-falcon-team branch (christopher.powers:2993) Bug#36442 Bug#42510

[Christopher Powers]

#At file:///home/cpowers/work/dev/dev-04/mysql/

 2993 Christopher Powers	2009-02-01
      Bug #42510, "Falcon: Default memory parameters must be changed"
      Bug #36442, "Falcon: crash during optimize table"
      
      Increased default page cache size from 4MB to 250MB
      Increased record scavenge threshold from 67 to 90
      Increased record scavenge floor from 50 to 80
modified:
  storage/falcon/SerialLog.cpp
  storage/falcon/StorageParameters.h
  storage/falcon/ha_falcon.cpp

per-file messages:
  storage/falcon/SerialLog.cpp
    Fixed recovery log messages
  storage/falcon/StorageParameters.h
    Increased falcon_record_scavenge_threshold from 67 to 90
    Increased falcon_record_scavenge_floor from 50 to 80
  storage/falcon/ha_falcon.cpp
    Increased falcon_page_cache_size from 4 to 250MB
=== modified file 'storage/falcon/SerialLog.cpp'
--- a/storage/falcon/SerialLog.cpp	2009-01-22 18:40:02 +0000
+++ b/storage/falcon/SerialLog.cpp	2009-02-01 09:50:43 +0000
@@ -285,7 +285,7 @@ void SerialLog::recover()
 	SerialLogBlock *recoveryBlock = recoveryWindow->firstBlock();
 	recoveryBlockNumber = recoveryBlock->blockNumber;
 	SerialLogBlock *lastBlock = findLastBlock(recoveryWindow);
-	Log::log("/nFirst recovery block is " I64FORMAT "\n", 
+	Log::log("\nFirst recovery block is " I64FORMAT "\n", 
 			(otherWindow) ? otherWindow->firstBlock()->blockNumber : recoveryBlockNumber);
 	Log::log("Last recovery block is " I64FORMAT "\n", lastBlock->blockNumber);
 
@@ -354,7 +354,7 @@ void SerialLog::recover()
 
 	// Next, make a second pass to reallocate any necessary pages
 
-	Log::log("\nRecovery phase 2...\n");
+	Log::log("Recovery phase 2...\n");
 	recordCount = 0;
 	
 	while ( (record = control.nextRecord()) )
@@ -383,7 +383,7 @@ void SerialLog::recover()
 
 	// Make a third pass doing things
 
-	Log::log("\nRecovery phase 3...\n");
+	Log::log("Recovery phase 3...\n");
 	recordCount = 0;
 	
 	while ( (record = control.nextRecord()) )

=== modified file 'storage/falcon/StorageParameters.h'
--- a/storage/falcon/StorageParameters.h	2008-10-20 21:28:11 +0000
+++ b/storage/falcon/StorageParameters.h	2009-02-01 09:50:43 +0000
@@ -26,8 +26,8 @@ PARAMETER_UINT(large_blob_threshold, "Th
 PARAMETER_UINT(lock_wait_timeout, "Transaction lock time period (seconds)", 0, 50,
INT_MAX, 0, NULL)
 PARAMETER_UINT(page_size, "The page size used when creating a Falcon tablespace.", 2048,
4096, 32768, 0x0200, NULL)
 PARAMETER_UINT(record_chill_threshold, "Bytes of pending record data that is 'frozen' to
the Falcon serial log.", 1, 5*1024*1024, 1024*1024*1024, 0,
&updateRecordChillThreshold)
-PARAMETER_UINT(record_scavenge_floor, "A percentage of falcon_record_memory_threshold
that defines the amount of record data that will remain in the record cache after a
scavenge run.", 10, 50, 90, 0x2000, &StorageInterface::updateRecordScavengeFloor)
-PARAMETER_UINT(record_scavenge_threshold, "The percentage of falcon_record_memory_max
that will cause the scavenger thread to start scavenging records from the record cache.",
10, 67, 100, 0x2000, &StorageInterface::updateRecordScavengeThreshold)
+PARAMETER_UINT(record_scavenge_floor, "A percentage of falcon_record_memory_threshold
that defines the amount of record data that will remain in the record cache after a
scavenge run.", 10, 80, 90, 0x2000, &StorageInterface::updateRecordScavengeFloor)
+PARAMETER_UINT(record_scavenge_threshold, "The percentage of falcon_record_memory_max
that will cause the scavenger thread to start scavenging records from the record cache.",
10, 90, 100, 0x2000, &StorageInterface::updateRecordScavengeThreshold)
 PARAMETER_UINT(serial_log_block_size, "Minimum block size for serial log.", 0, 0, 4096,
0, NULL)
 PARAMETER_UINT(serial_log_buffers, "The number of buffers allocated for Falcon serial
log.", SRL_MIN_WINDOWS, 20, 1000, 0x0200, NULL)
 PARAMETER_UINT(serial_log_priority, "Whether or not serial log has write priority over
other writes.", 0, 1, 1, 0, NULL)

=== modified file 'storage/falcon/ha_falcon.cpp'
--- a/storage/falcon/ha_falcon.cpp	2009-01-21 16:48:25 +0000
+++ b/storage/falcon/ha_falcon.cpp	2009-02-01 09:50:43 +0000
@@ -3930,7 +3930,7 @@ static MYSQL_SYSVAR_UINT(allocation_exte
 static MYSQL_SYSVAR_ULONGLONG(page_cache_size, falcon_page_cache_size,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
   "The amount of memory to be used for the database page cache.",
-  NULL, NULL, LL(4)<<20, LL(2)<<20, (ulonglong) max_memory_address,
LL(1)<<20);
+  NULL, NULL, LL(250)<<20, LL(2)<<20, (ulonglong) max_memory_address,
LL(1)<<20);
 
 static MYSQL_THDVAR_BOOL(consistent_read, PLUGIN_VAR_OPCMDARG,
    "Enable Consistent Read Mode for Repeatable Reads",