summaryrefslogtreecommitdiff
path: root/sql/sql_bitmap.h
diff options
context:
space:
mode:
authorunknown <tulin@dl145b.mysql.com>2005-07-20 00:40:49 +0200
committerunknown <tulin@dl145b.mysql.com>2005-07-20 00:40:49 +0200
commitee7e3e710fb08ccb7c3ce701605fdb8e3cfba59d (patch)
tree6417c22b3952943cd8c849947df979db69f86418 /sql/sql_bitmap.h
parent8707870dd9591da198d9b9efa864d489e2f6764a (diff)
downloadmariadb-git-ee7e3e710fb08ccb7c3ce701605fdb8e3cfba59d.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))));
}