bk commit into 6.0 tree (hakank:1.2786)

[Hakan Kuecuekyilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakan. When hakan 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-01-30 12:21:34+01:00, hakank@lu0011.(none) +2 -0
  Make this test work on systems <= 1GB.

  mysql-test/suite/falcon/r/falcon_options.result@stripped, 2008-01-30 12:21:32+01:00, hakank@lu0011.(none) +3 -3
    Make this test work on systems <= 1GB.

  mysql-test/suite/falcon/t/falcon_options.test@stripped, 2008-01-30 12:21:32+01:00, hakank@lu0011.(none) +2 -4
    Make this test work on systems <= 1GB.

diff -Nrup a/mysql-test/suite/falcon/r/falcon_options.result b/mysql-test/suite/falcon/r/falcon_options.result
--- a/mysql-test/suite/falcon/r/falcon_options.result	2007-12-27 07:23:30 +01:00
+++ b/mysql-test/suite/falcon/r/falcon_options.result	2008-01-30 12:21:32 +01:00
@@ -68,10 +68,10 @@ SELECT @@GLOBAL.falcon_max_transaction_b
 SELECT @@GLOBAL.falcon_record_memory_max;
 @@GLOBAL.falcon_record_memory_max
 262144000
-SET GLOBAL falcon_record_memory_max = 1073741824;
+SET GLOBAL falcon_record_memory_max = 536870912;
 SELECT @@GLOBAL.falcon_record_memory_max;
 @@GLOBAL.falcon_record_memory_max
-1073741824
[phone]
 SELECT * FROM INFORMATION_SCHEMA.global_variables
 WHERE variable_name LIKE 'falcon%';
 VARIABLE_NAME	VARIABLE_VALUE
@@ -91,7 +91,7 @@ FALCON_MAX_TRANSACTION_BACKLOG	10001
 FALCON_PAGE_CACHE_SIZE	4194304
 FALCON_PAGE_SIZE	4096
 FALCON_RECORD_CHILL_THRESHOLD	5
-FALCON_RECORD_MEMORY_MAX	1073741824
+FALCON_RECORD_MEMORY_MAX	536870912
 FALCON_RECORD_SCAVENGE_FLOOR	50
 FALCON_RECORD_SCAVENGE_THRESHOLD	67
 FALCON_SCAVENGE_SCHEDULE	15,45 * * * * *
diff -Nrup a/mysql-test/suite/falcon/t/falcon_options.test b/mysql-test/suite/falcon/t/falcon_options.test
--- a/mysql-test/suite/falcon/t/falcon_options.test	2007-12-16 06:23:43 +01:00
+++ b/mysql-test/suite/falcon/t/falcon_options.test	2008-01-30 12:21:32 +01:00
@@ -2,7 +2,7 @@
 
 SHOW VARIABLES LIKE 'falcon_%';
 
---real_sleep=10
+--real_sleep 3
 
 # Test that these server variables are READ ONLY.
 
@@ -36,7 +36,7 @@ SET GLOBAL falcon_max_transaction_backlo
 SELECT @@GLOBAL.falcon_max_transaction_backlog;
 
 SELECT @@GLOBAL.falcon_record_memory_max;
-SET GLOBAL falcon_record_memory_max = 1073741824;
+SET GLOBAL falcon_record_memory_max = 536870912;
 SELECT @@GLOBAL.falcon_record_memory_max;
 
 
@@ -44,5 +44,3 @@ SELECT @@GLOBAL.falcon_record_memory_max
 --sorted_result
 SELECT * FROM INFORMATION_SCHEMA.global_variables
   WHERE variable_name LIKE 'falcon%';
-
---real_sleep=10