summaryrefslogtreecommitdiff
path: root/sql/handler.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-11-02 12:55:46 +0100
committerSergei Golubchik <sergii@pisem.net>2011-11-02 12:55:46 +0100
commit90b43902b0e67bcd4c6a5f08d7d76c93df74d4c8 (patch)
treeabea3216f5299f3cb53c92e6a79e37daa883b78a /sql/handler.cc
parent7714adaef85cb7d83b1624db2198aec40ddefa24 (diff)
downloadmariadb-git-90b43902b0e67bcd4c6a5f08d7d76c93df74d4c8.tar.gz
compilation warnings on Windows
Diffstat (limited to 'sql/handler.cc')
-rw-r--r--sql/handler.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/sql/handler.cc b/sql/handler.cc
index 1aeb818b65d..7fc5aea48fa 100644
--- a/sql/handler.cc
+++ b/sql/handler.cc
@@ -4084,9 +4084,9 @@ int ha_init_key_cache(const char *name, KEY_CACHE *key_cache, void *unused
mysql_mutex_lock(&LOCK_global_system_variables);
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;
- uint partitions= key_cache->param_partitions;
+ uint division_limit= (uint)key_cache->param_division_limit;
+ uint age_threshold= (uint)key_cache->param_age_threshold;
+ uint partitions= (uint)key_cache->param_partitions;
mysql_mutex_unlock(&LOCK_global_system_variables);
DBUG_RETURN(!init_key_cache(key_cache,
tmp_block_size,
@@ -4110,8 +4110,8 @@ int ha_resize_key_cache(KEY_CACHE *key_cache)
mysql_mutex_lock(&LOCK_global_system_variables);
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;
+ uint division_limit= (uint)key_cache->param_division_limit;
+ uint age_threshold= (uint)key_cache->param_age_threshold;
mysql_mutex_unlock(&LOCK_global_system_variables);
DBUG_RETURN(!resize_key_cache(key_cache, tmp_block_size,
tmp_buff_size,
@@ -4131,8 +4131,8 @@ int ha_change_key_cache_param(KEY_CACHE *key_cache)
if (key_cache->key_cache_inited)
{
mysql_mutex_lock(&LOCK_global_system_variables);
- uint division_limit= key_cache->param_division_limit;
- uint age_threshold= key_cache->param_age_threshold;
+ uint division_limit= (uint)key_cache->param_division_limit;
+ uint age_threshold= (uint)key_cache->param_age_threshold;
mysql_mutex_unlock(&LOCK_global_system_variables);
change_key_cache_param(key_cache, division_limit, age_threshold);
}
@@ -4152,9 +4152,9 @@ int ha_repartition_key_cache(KEY_CACHE *key_cache)
mysql_mutex_lock(&LOCK_global_system_variables);
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;
- uint partitions= key_cache->param_partitions;
+ uint division_limit= (uint)key_cache->param_division_limit;
+ uint age_threshold= (uint)key_cache->param_age_threshold;
+ uint partitions= (uint)key_cache->param_partitions;
mysql_mutex_unlock(&LOCK_global_system_variables);
DBUG_RETURN(!repartition_key_cache(key_cache, tmp_block_size,
tmp_buff_size,