diff options
| author | unknown <svoj@june.mysql.com> | 2007-05-23 12:41:30 +0500 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-05-23 12:41:30 +0500 |
| commit | 32cd2fe6c215518362b033f4a2394f8f15e9a11f (patch) | |
| tree | 54d4aab0a236b895fa6416b69223cae050fa4fac /sql/handler.cc | |
| parent | 2d95236b718002a48e31ded9449327da077200d8 (diff) | |
| parent | c367385f7f8f5850c5d37ee1811db2ffa260218c (diff) | |
| download | mariadb-git-32cd2fe6c215518362b033f4a2394f8f15e9a11f.tar.gz | |
Merge mysql.com:/home/svoj/devel/bk/mysql-5.1
into mysql.com:/home/svoj/devel/mysql/merge/mysql-5.1-engines
mysql-test/mysql-test-run.pl:
Auto merged
mysql-test/t/disabled.def:
Auto merged
sql/handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
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 48600c68daf..c7c3918bd2e 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2717,8 +2717,8 @@ 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); - 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); |