diff options
| author | Joerg Bruehe <joerg@mysql.com> | 2008-12-10 21:14:50 +0100 |
|---|---|---|
| committer | Joerg Bruehe <joerg@mysql.com> | 2008-12-10 21:14:50 +0100 |
| commit | 2181c959183262b6b7f64c67b12f2715d8528572 (patch) | |
| tree | 0808625d28751a07f6894b2bffcf47fcf1e71fbf /sql/handler.cc | |
| parent | 96e0bf50d942258722b25e9d17d209d40eaacd28 (diff) | |
| parent | ba816c14a9bc8012759da9d58f858f1e73bec708 (diff) | |
| download | mariadb-git-2181c959183262b6b7f64c67b12f2715d8528572.tar.gz | |
Merge main 5.1 into 5.1-build
Diffstat (limited to 'sql/handler.cc')
| -rw-r--r-- | sql/handler.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.cc b/sql/handler.cc index 92ebc53121b..938fb9a63ba 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -3627,7 +3627,7 @@ int ha_init_key_cache(const char *name, KEY_CACHE *key_cache) 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; @@ -3651,7 +3651,7 @@ int ha_resize_key_cache(KEY_CACHE *key_cache) 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; |