diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2005-07-13 01:25:36 +0200 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2005-07-13 01:25:36 +0200 |
| commit | e5ca7155485483d6b9339f3c8197ba647ac1f1ef (patch) | |
| tree | a81399659f1e64272f331cd1179aeecf3ca610a4 /mysys/my_bitmap.c | |
| parent | e4be45da93b3b64ede35053a7fa3989a40a2766e (diff) | |
| download | mariadb-git-e5ca7155485483d6b9339f3c8197ba647ac1f1ef.tar.gz | |
post merge fixes
Diffstat (limited to 'mysys/my_bitmap.c')
| -rw-r--r-- | mysys/my_bitmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_bitmap.c b/mysys/my_bitmap.c index 6cfabad1d3b..490a476691d 100644 --- a/mysys/my_bitmap.c +++ b/mysys/my_bitmap.c @@ -174,7 +174,7 @@ void bitmap_free(MY_BITMAP *map) my_bool bitmap_fast_test_and_set(MY_BITMAP *map, uint bitmap_bit) { - uchar *byte= map->bitmap + (bitmap_bit / 8); + uchar *byte= (uchar*)map->bitmap + (bitmap_bit / 8); uchar bit= 1 << ((bitmap_bit) & 7); uchar res= (*byte) & bit; *byte|= bit; @@ -198,7 +198,7 @@ my_bool bitmap_fast_test_and_set(MY_BITMAP *map, uint bitmap_bit) my_bool bitmap_test_and_set(MY_BITMAP *map, uint bitmap_bit) { my_bool res; - DBUG_ASSERT(map->bitmap && bitmap_bit < map->bitmap_size*8); + DBUG_ASSERT(map->bitmap && bitmap_bit < map->n_bits); bitmap_lock(map); res= bitmap_fast_test_and_set(map, bitmap_bit); bitmap_unlock(map); |