summaryrefslogtreecommitdiff
path: root/storage/maria/ma_bitmap.c
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2011-11-23 18:25:07 +0100
committerSergei Golubchik <sergii@pisem.net>2011-11-23 18:25:07 +0100
commit7189f09aa6d434fc889cb6d819e97c09f8cc0bcf (patch)
tree47a31db1f5dc87b0b0e6ecbe581e16658ab07fa9 /storage/maria/ma_bitmap.c
parentfeba65a55495ce5cd9f5d8e6e0af8345485b52a1 (diff)
downloadmariadb-git-7189f09aa6d434fc889cb6d819e97c09f8cc0bcf.tar.gz
compiler warnings/errors
Diffstat (limited to 'storage/maria/ma_bitmap.c')
-rw-r--r--storage/maria/ma_bitmap.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/storage/maria/ma_bitmap.c b/storage/maria/ma_bitmap.c
index 76049a54238..ab9b49b6219 100644
--- a/storage/maria/ma_bitmap.c
+++ b/storage/maria/ma_bitmap.c
@@ -1239,10 +1239,9 @@ static my_bool allocate_head(MARIA_FILE_BITMAP *bitmap, uint size,
uint min_bits= size_to_head_pattern(bitmap, size);
uchar *data= bitmap->map, *end= data + bitmap->used_size;
uchar *best_data= 0;
- uint best_bits= (uint) -1, best_pos;
+ uint best_bits= (uint) -1, UNINIT_VAR(best_pos);
DBUG_ENTER("allocate_head");
- LINT_INIT(best_pos);
DBUG_ASSERT(size <= FULL_PAGE_SIZE(bitmap->block_size));
for (; data < end; data+= 6)
@@ -1319,11 +1318,10 @@ static my_bool allocate_tail(MARIA_FILE_BITMAP *bitmap, uint size,
uint min_bits= size_to_tail_pattern(bitmap, size);
uchar *data= bitmap->map, *end= data + bitmap->used_size;
uchar *best_data= 0;
- uint best_bits= (uint) -1, best_pos;
+ uint best_bits= (uint) -1, UNINIT_VAR(best_pos);
DBUG_ENTER("allocate_tail");
DBUG_PRINT("enter", ("size: %u", size));
- LINT_INIT(best_pos);
/*
We have to add DIR_ENTRY_SIZE here as this is not part of the data size
See call to allocate_tail() in find_tail().