From: Date: December 11 2008 1:28pm
Subject: bzr commit into mysql-6.0-falcon-team branch (svoj:2933) Bug#33583
List-Archive: http://lists.mysql.com/commits/61356
X-Bug: 33583
Message-Id: <20081211122837.3A8C841CED0@june.myoffice.izhnet.ru>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7BIT

#At file:///home/svoj/devel/bzr-mysql/mysql-6.0-falcon-team-bug33583/

 2933 Sergey Vojtovich	2008-12-11
      BUG#33583 - Falcon memory parameters on 32bit system can be set > 4GB
      
      Fixed that falcon_page_cache_size can be set to value bigger than
      maximum addressable memory.
      
      With this fix, if falcon_page_cache_size is set to bigger than
      maximum addressable memory, it's value is adjusted to maximum
      addressable memory and a warning is issued to the error log.
modified:
  storage/falcon/ha_falcon.cpp

per-file messages:
  storage/falcon/ha_falcon.cpp
    Changed the maximum for falcon_page_cache_size to the
    maximum addressable memory.
=== modified file 'storage/falcon/ha_falcon.cpp'
--- a/storage/falcon/ha_falcon.cpp	2008-12-01 22:18:34 +0000
+++ b/storage/falcon/ha_falcon.cpp	2008-12-11 12:28:15 +0000
@@ -3673,7 +3673,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) ~0, LL(1)<<20);
+  NULL, NULL, LL(4)<<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",