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

[Christopher Powers]

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

 2994 Christopher Powers	2009-02-01
      Bug #42510, "Falcon: Default memory parameters must be changed"
      
      Updated Falcon options tests.
modified:
  mysql-test/suite/falcon/r/falcon_options.result
  mysql-test/suite/falcon/r/falcon_options2.result

per-file messages:
  mysql-test/suite/falcon/r/falcon_options.result
    Updated page cache and scavenge options
  mysql-test/suite/falcon/r/falcon_options2.result
    Updated page cache and scavenge options
=== modified file 'mysql-test/suite/falcon/r/falcon_options.result'
--- a/mysql-test/suite/falcon/r/falcon_options.result	2008-12-10 21:45:53 +0000
+++ b/mysql-test/suite/falcon/r/falcon_options.result	2009-02-01 16:54:21 +0000
@@ -14,12 +14,12 @@ falcon_index_chill_threshold	4194304
 falcon_io_threads	2
 falcon_large_blob_threshold	160000
 falcon_lock_wait_timeout	50
-falcon_page_cache_size	4194304
+falcon_page_cache_size	262144000
 falcon_page_size	4096
 falcon_record_chill_threshold	5242880
 falcon_record_memory_max	262144000
-falcon_record_scavenge_floor	50
-falcon_record_scavenge_threshold	67
+falcon_record_scavenge_floor	80
+falcon_record_scavenge_threshold	90
 falcon_scavenge_schedule	15,45 * * * * *
 falcon_serial_log_block_size	0
 falcon_serial_log_buffers	20
@@ -41,7 +41,7 @@ SET GLOBAL falcon_serial_log_dir = '/foo
 ERROR HY000: Variable 'falcon_serial_log_dir' is a read only variable
 SELECT @@GLOBAL.falcon_page_cache_size;
 @@GLOBAL.falcon_page_cache_size
-4194304
[phone]
 SET GLOBAL falcon_page_cache_size = 8M;
 ERROR HY000: Variable 'falcon_page_cache_size' is a read only variable
 SELECT @@GLOBAL.falcon_page_size;
@@ -95,12 +95,12 @@ FALCON_INDEX_CHILL_THRESHOLD	1073741824
 FALCON_IO_THREADS	2
 FALCON_LARGE_BLOB_THRESHOLD	160000
 FALCON_LOCK_WAIT_TIMEOUT	50
-FALCON_PAGE_CACHE_SIZE	4194304
+FALCON_PAGE_CACHE_SIZE	262144000
 FALCON_PAGE_SIZE	4096
 FALCON_RECORD_CHILL_THRESHOLD	1073741824
 FALCON_RECORD_MEMORY_MAX	536870912
-FALCON_RECORD_SCAVENGE_FLOOR	50
-FALCON_RECORD_SCAVENGE_THRESHOLD	67
+FALCON_RECORD_SCAVENGE_FLOOR	80
+FALCON_RECORD_SCAVENGE_THRESHOLD	90
 FALCON_SCAVENGE_SCHEDULE	15,45 * * * * *
 FALCON_SERIAL_LOG_BLOCK_SIZE	0
 FALCON_SERIAL_LOG_BUFFERS	20

=== modified file 'mysql-test/suite/falcon/r/falcon_options2.result'
--- a/mysql-test/suite/falcon/r/falcon_options2.result	2008-12-10 21:45:53 +0000
+++ b/mysql-test/suite/falcon/r/falcon_options2.result	2009-02-01 16:54:21 +0000
@@ -14,12 +14,12 @@ FALCON_INDEX_CHILL_THRESHOLD	4194304
 FALCON_IO_THREADS	2
 FALCON_LARGE_BLOB_THRESHOLD	160000
 FALCON_LOCK_WAIT_TIMEOUT	50
-FALCON_PAGE_CACHE_SIZE	4194304
+FALCON_PAGE_CACHE_SIZE	262144000
 FALCON_PAGE_SIZE	4096
 FALCON_RECORD_CHILL_THRESHOLD	5242880
 FALCON_RECORD_MEMORY_MAX	262144000
-FALCON_RECORD_SCAVENGE_FLOOR	50
-FALCON_RECORD_SCAVENGE_THRESHOLD	67
+FALCON_RECORD_SCAVENGE_FLOOR	80
+FALCON_RECORD_SCAVENGE_THRESHOLD	90
 FALCON_SCAVENGE_SCHEDULE	15,45 * * * * *
 FALCON_SERIAL_LOG_BLOCK_SIZE	0
 FALCON_SERIAL_LOG_BUFFERS	20
@@ -68,7 +68,7 @@ SELECT @@falcon_lock_wait_timeout;
 50
 SELECT @@falcon_page_cache_size;
 @@falcon_page_cache_size
-4194304
[phone]
 SELECT @@falcon_page_size;
 @@falcon_page_size
 4096
@@ -80,10 +80,10 @@ SELECT @@falcon_record_memory_max;
 262144000
 SELECT @@falcon_record_scavenge_floor;
 @@falcon_record_scavenge_floor
-50
+80
 SELECT @@falcon_record_scavenge_threshold;
 @@falcon_record_scavenge_threshold
-67
+90
 SELECT @@falcon_scavenge_schedule;
 @@falcon_scavenge_schedule
 15,45 * * * * *