diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-11-29 01:10:17 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-11-29 01:10:17 +0100 |
| commit | 0c3b78438b627127f1a567aaede90466be549f52 (patch) | |
| tree | 645f3f6ea1f809a2e2bc1a6104a076421daee67e /storage/maria | |
| parent | 1670845c3b3364720881ad778e456c6b7d852397 (diff) | |
| download | mariadb-git-0c3b78438b627127f1a567aaede90466be549f52.tar.gz | |
Fix Windows build, and a conversion truncation warning.
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ma_bitmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/maria/ma_bitmap.c b/storage/maria/ma_bitmap.c index 81b436346b1..00f529be92d 100644 --- a/storage/maria/ma_bitmap.c +++ b/storage/maria/ma_bitmap.c @@ -282,7 +282,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; @@ -291,7 +291,7 @@ my_bool _ma_bitmap_init(MARIA_SHARE *share, File file, bytes/= 6; bytes*= 6; bitmap->last_bitmap_page= last_bitmap_page; - bitmap->last_total_size= bytes; + bitmap->last_total_size= (uint)bytes; *last_page= ((last_bitmap_page + bytes*8/3)); } |