summaryrefslogtreecommitdiff
path: root/sql/sql_bitmap.h
diff options
context:
space:
mode:
authortulin@dl145b.mysql.com <>2005-07-20 00:40:49 +0200
committertulin@dl145b.mysql.com <>2005-07-20 00:40:49 +0200
commit7a37e581357c7345a1b5b2008f4b5bb3702a16f3 (patch)
tree6417c22b3952943cd8c849947df979db69f86418 /sql/sql_bitmap.h
parenta6c21a079163d2d09163cb4084ada38f4ddac929 (diff)
downloadmariadb-git-7a37e581357c7345a1b5b2008f4b5bb3702a16f3.tar.gz
merge
Diffstat (limited to 'sql/sql_bitmap.h')
-rw-r--r--sql/sql_bitmap.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_bitmap.h b/sql/sql_bitmap.h
index b2994da71f7..35c501ede56 100644
--- a/sql/sql_bitmap.h
+++ b/sql/sql_bitmap.h
@@ -55,7 +55,7 @@ public:
void intersect_extended(ulonglong map2buff)
{
intersect(map2buff);
- if (map.bitmap_size > sizeof(ulonglong))
+ if (map.n_bits > sizeof(ulonglong) * 8)
bitmap_set_above(&map, sizeof(ulonglong),
test(map2buff & (LL(1) << (sizeof(ulonglong) * 8 - 1))));
}