summaryrefslogtreecommitdiff
path: root/include/my_alloc.h
diff options
context:
space:
mode:
authorunknown <monty@mysql.com/narttu.mysql.fi>2008-01-13 00:30:38 +0200
committerunknown <monty@mysql.com/narttu.mysql.fi>2008-01-13 00:30:38 +0200
commit89ff50d4296e849cec70799f7bda8c6217601867 (patch)
tree73de231121178e9ffeb7e50acc0dfa24a5b2557d /include/my_alloc.h
parent0cccfe30cc5ba9e6b02b90eeec73753b5136f892 (diff)
downloadmariadb-git-89ff50d4296e849cec70799f7bda8c6217601867.tar.gz
Fixed compiler warnings
Fixed type that caused windows builds to fail include/my_alloc.h: Use size_t for memory areas instead of uint mysys/mf_iocache.c: Fixed compiler warnings by adding casts mysys/my_compress.c: Fixed compiler warnings by adding casts mysys/my_getsystime.c: Fixed typo mysys/my_static.h: Use size_t for memory areas mysys/safemalloc.c: Use size_t for memory areas storage/maria/ma_bitmap.c: Fixed compiler warnings by adding casts storage/maria/ma_blockrec.c: Fixed compiler warnings by adding casts storage/maria/ma_cache.c: Use size_t for memory areas storage/maria/ma_info.c: Use size_t for memory areas storage/maria/ma_key.c: Fixed compiler warnings by adding casts storage/maria/ma_locking.c: Fixed compiler warnings by adding casts storage/maria/ma_open.c: Fixed compiler warnings by adding casts storage/maria/ma_packrec.c: Fixed compiler warnings by fixing type for variable storage/maria/ma_statrec.c: Fixed compiler warnings by adding casts storage/maria/ma_write.c: Fixed compiler warnings by adding casts storage/maria/maria_def.h: Use size_t for memory areas storage/myisam/mi_search.c: Fixed compiler warnings by adding casts
Diffstat (limited to 'include/my_alloc.h')
-rw-r--r--include/my_alloc.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/my_alloc.h b/include/my_alloc.h
index 93b7438a1df..02500865f80 100644
--- a/include/my_alloc.h
+++ b/include/my_alloc.h
@@ -26,8 +26,8 @@
typedef struct st_used_mem
{ /* struct for once_alloc (block) */
struct st_used_mem *next; /* Next block in use */
- unsigned int left; /* memory left in block */
- unsigned int size; /* size of block */
+ size_t left; /* memory left in block */
+ size_t size; /* size of block */
} USED_MEM;
@@ -39,12 +39,12 @@ typedef struct st_mem_root
/* if block have less memory it will be put in 'used' list */
size_t min_malloc;
size_t block_size; /* initial block size */
- unsigned int block_num; /* allocated blocks counter */
+ unsigned long block_num; /* allocated blocks counter */
/*
first free block in queue test counter (if it exceed
MAX_BLOCK_USAGE_BEFORE_DROP block will be dropped in 'used' list)
*/
- unsigned int first_block_usage;
+ unsigned long first_block_usage;
void (*error_handler)(void);
} MEM_ROOT;