summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@montyprogram.com>2011-09-16 18:26:20 +0200
committerVladislav Vaintroub <wlad@montyprogram.com>2011-09-16 18:26:20 +0200
commit999c37bb0faa64a3c01b6ea0c71b44eb334735a1 (patch)
tree423c4f838ed453cacedfa31d5b8274ce8259ef6b /storage
parent574e51e5fd53649fb560237eb89a8ff65ac45e22 (diff)
parentd202a22132bf63f10f770e97399cefeffee9a388 (diff)
downloadmariadb-git-999c37bb0faa64a3c01b6ea0c71b44eb334735a1.tar.gz
merge
Diffstat (limited to 'storage')
-rw-r--r--storage/maria/ma_bitmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/maria/ma_bitmap.c b/storage/maria/ma_bitmap.c
index a98ef71604d..39c3cd27d33 100644
--- a/storage/maria/ma_bitmap.c
+++ b/storage/maria/ma_bitmap.c
@@ -284,7 +284,7 @@ my_bool _ma_bitmap_init(MARIA_SHARE *share, File file,
*/
{
pgcache_page_no_t last_bitmap_page;
- ulong blocks, bytes;
+ pgcache_page_no_t blocks, bytes;
last_bitmap_page= *last_page - *last_page % bitmap->pages_covered;
blocks= *last_page - last_bitmap_page;