diff options
| author | Kent Boortz <kent.boortz@oracle.com> | 2011-07-03 17:47:37 +0200 |
|---|---|---|
| committer | Kent Boortz <kent.boortz@oracle.com> | 2011-07-03 17:47:37 +0200 |
| commit | 027b5f1ed4f0130bbbc174eb45162a402c65f43f (patch) | |
| tree | 448d397ed328f719a29a8fbbd54df8d943ed7274 /include/my_bitmap.h | |
| parent | 68f00a56868c5ca21b2d51598e1a43969ecf4896 (diff) | |
| parent | dd4957965411c1b67ebfb1ba8650a3090d305f63 (diff) | |
| download | mariadb-git-027b5f1ed4f0130bbbc174eb45162a402c65f43f.tar.gz | |
Updated/added copyright headers
Diffstat (limited to 'include/my_bitmap.h')
| -rw-r--r-- | include/my_bitmap.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/my_bitmap.h b/include/my_bitmap.h index 2c01254f203..34c9ac9bb96 100644 --- a/include/my_bitmap.h +++ b/include/my_bitmap.h @@ -1,5 +1,5 @@ /* - Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -151,9 +151,10 @@ bitmap_is_set(const MY_BITMAP *map,uint bit) static inline my_bool bitmap_cmp(const MY_BITMAP *map1, const MY_BITMAP *map2) { - *(map1)->last_word_ptr|= (map1)->last_word_mask; - *(map2)->last_word_ptr|= (map2)->last_word_mask; - return memcmp((map1)->bitmap, (map2)->bitmap, 4*no_words_in_map((map1)))==0; + if (memcmp(map1->bitmap, map2->bitmap, 4*(no_words_in_map(map1)-1)) != 0) + return FALSE; + return ((*map1->last_word_ptr | map1->last_word_mask) == + (*map2->last_word_ptr | map2->last_word_mask)); } #define bitmap_clear_all(MAP) \ |