diff options
| author | istruewing@chilla.local <> | 2007-05-10 17:30:50 +0200 |
|---|---|---|
| committer | istruewing@chilla.local <> | 2007-05-10 17:30:50 +0200 |
| commit | e2fa2becfc2733324ac88c3105b6aaae433fc9cb (patch) | |
| tree | ead056dae5707ac88057e9cfc5c3eef52c74058d /sql/handler.cc | |
| parent | 10ecf5855bc5754a296796ab14bb20a80cc19067 (diff) | |
| parent | 942cd7d42448e9ad0128fb99ac1267638511899d (diff) | |
| download | mariadb-git-e2fa2becfc2733324ac88c3105b6aaae433fc9cb.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into chilla.local:/home/mydev/mysql-5.1-bug17332
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 9e1d79dd1ad..be807cb35cf 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); |