bzr push into mysql-6.0 branch (vvaintroub:2941 to 2942) Bug#39494

[Vladislav Vaintroub]

 2942 Vladislav Vaintroub	2008-11-21 [merge]
      merge fix for bug#39494 from 5.1
modified:
  sql/handler.cc

 2941 Ramil Kalimullin	2008-11-21
      Fix for bug#40054: 'check table .. for upgrade' doesn't detect
      collation change made in 6.0.{1, 6}
      
      Problem: 'CHECK TABLE ... FOR UPGRADE' did not check for
      incompatible collation changes made in MySQL 6.0.1 and 6.0.6.
      
      Fix: add the check.
modified:
  sql/handler.cc

=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2008-11-21 08:20:56 +0000
+++ b/sql/handler.cc	2008-11-21 08:53:18 +0000
@@ -3616,7 +3616,7 @@ int ha_init_key_cache(const char *name, 
   if (!key_cache->key_cache_inited)
   {
     pthread_mutex_lock(&LOCK_global_system_variables);
-    ulong tmp_buff_size= (ulong) key_cache->param_buff_size;
+    size_t tmp_buff_size= (size_t) 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;
@@ -3640,7 +3640,7 @@ int ha_resize_key_cache(KEY_CACHE *key_c
   if (key_cache->key_cache_inited)
   {
     pthread_mutex_lock(&LOCK_global_system_variables);
-    long tmp_buff_size= (long) key_cache->param_buff_size;
+    size_t tmp_buff_size= (size_t) key_cache->param_buff_size;
     long tmp_block_size= (long) key_cache->param_block_size;
     uint division_limit= key_cache->param_division_limit;
     uint age_threshold=  key_cache->param_age_threshold;