From ee7e3e710fb08ccb7c3ce701605fdb8e3cfba59d Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 20 Jul 2005 00:40:49 +0200 Subject: merge --- mysys/my_bitmap.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'mysys/my_bitmap.c') diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c index ec03e345109..3c25321b715 100644 --- a/mysys/my_bitmap.c +++ b/mysys/my_bitmap.c @@ -351,11 +351,12 @@ void bitmap_intersect(MY_BITMAP *map, const MY_BITMAP *map2) void bitmap_set_above(MY_BITMAP *map, uint from_byte, uint use_bit) { uchar use_byte= use_bit ? 0xff : 0; - uchar *to= map->bitmap + from_byte; - uchar *end= map->bitmap + map->bitmap_size; + uchar *to= (uchar *)map->bitmap + from_byte; + uchar *end= (uchar *)map->bitmap + (map->n_bits+7)/8; while (to < end) *to++= use_byte; + *map->last_word_ptr|= map->last_word_mask; /*Set last bits again*/ } -- cgit v1.2.1