bk commit into 5.0 tree (holyfoot:1.2630) BUG#36705

[holyfoot]

Below is the list of changes that have just been committed into a local
5.0 repository of holyfoot.  When holyfoot 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-05-17 12:53:47+05:00, holyfoot@stripped +1 -0
  Bug #36705 key_buffer_size of >= 2G allocates all availabel virtual memory on 64-bit
wondo.
  
  temporary variables of 'long' types were used to store ulong values,
  that causes init_key_cache to receive distorted parameters

  sql/handler.cc@stripped, 2008-05-17 12:53:45+05:00, holyfoot@stripped +2 -2
    Bug #36705 key_buffer_size of >= 2G allocates all availabel virtual memory on
64-bit wondo.
    
    types of temporary variables changed to match init_key_cache() parameters

diff -Nrup a/sql/handler.cc b/sql/handler.cc
--- a/sql/handler.cc	2008-05-12 20:59:15 +05:00
+++ b/sql/handler.cc	2008-05-17 12:53:45 +05:00
@@ -2350,8 +2350,8 @@ int ha_init_key_cache(const char *name, 
   if (!key_cache->key_cache_inited)
   {
     pthread_mutex_lock(&LOCK_global_system_variables);
-    long tmp_buff_size= (long) key_cache->param_buff_size;
-    long tmp_block_size= (long) key_cache->param_block_size;
+    ulong tmp_buff_size= (ulong) key_cache->param_buff_size;
+    uint tmp_block_size= (uint) key_cache->param_block_size;
     uint division_limit= key_cache->param_division_limit;
     uint age_threshold=  key_cache->param_age_threshold;
     pthread_mutex_unlock(&LOCK_global_system_variables);