diff options
| author | holyfoot/hf@mysql.com/hfmain.(none) <> | 2007-10-23 14:27:11 +0500 |
|---|---|---|
| committer | holyfoot/hf@mysql.com/hfmain.(none) <> | 2007-10-23 14:27:11 +0500 |
| commit | 9f323e1a3a9d7ce57ad9adff4c4b2d7a58913136 (patch) | |
| tree | cd63c3b11cfe72d964400e90f9a1c30d50106a25 /myisam | |
| parent | 5b67dca4426e7d00a20f2bf4dffbf718dea3423c (diff) | |
| download | mariadb-git-9f323e1a3a9d7ce57ad9adff4c4b2d7a58913136.tar.gz | |
type conversions fixed to avoid warnings on Windows
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_write.c | 2 | ||||
| -rw-r--r-- | myisam/sort.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/myisam/mi_write.c b/myisam/mi_write.c index cc17d4c6165..967fbdc2330 100644 --- a/myisam/mi_write.c +++ b/myisam/mi_write.c @@ -975,7 +975,7 @@ int mi_init_bulk_insert(MI_INFO *info, ulong cache_size, ha_rows rows) DBUG_RETURN(0); if (rows && rows*total_keylength < cache_size) - cache_size=rows; + cache_size= (ulong)rows; else cache_size/=total_keylength*16; diff --git a/myisam/sort.c b/myisam/sort.c index f48161b7c8e..023f70d18b9 100644 --- a/myisam/sort.c +++ b/myisam/sort.c @@ -141,7 +141,7 @@ int _create_index_by_sort(MI_SORT_PARAM *info,my_bool no_messages, if ((records < UINT_MAX32) && ((my_off_t) (records + 1) * (sort_length + sizeof(char*)) <= (my_off_t) memavl)) - keys= records+1; + keys= (uint)records+1; else do { @@ -349,7 +349,7 @@ pthread_handler_t thr_find_all_keys(void *arg) sort_keys= (uchar **) NULL; memavl= max(sort_param->sortbuff_size, MIN_SORT_MEMORY); - idx= sort_param->sort_info->max_records; + idx= (uint)sort_param->sort_info->max_records; sort_length= sort_param->key_length; maxbuffer= 1; |