diff options
| author | unknown <istruewing@chilla.local> | 2007-03-20 17:59:09 +0100 |
|---|---|---|
| committer | unknown <istruewing@chilla.local> | 2007-03-20 17:59:09 +0100 |
| commit | 206b99e77810dfe8aea5813bbab293bed1c8ecd0 (patch) | |
| tree | 4cde4ad1f259a472f11c1611800716539c7206bf /sql/handler.cc | |
| parent | e3108256e7e5118cd2097f2bfbc9987018a6b8a5 (diff) | |
| parent | 3514500e8d46ce566e80a3b052f47ab393187cc3 (diff) | |
| download | mariadb-git-206b99e77810dfe8aea5813bbab293bed1c8ecd0.tar.gz | |
Merge chilla.local:/home/mydev/mysql-5.1-bug17332-old
into chilla.local:/home/mydev/mysql-5.1-bug17332
sql/handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
mysys/mf_keycache.c:
Bug#17332 - changing key_buffer_size on a running server
can crash under load
Manual merge
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 23c3103493e..f911c8554e3 100644 --- a/sql/handler.cc +++ b/sql/handler.cc @@ -2691,8 +2691,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); |