diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-10 21:04:29 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-10 21:04:29 +0100 |
| commit | 4c4c0226a0bb43393b612c2a9a95dcbcae9e84d5 (patch) | |
| tree | c30efc9a6f308dc04e2b17e0fec4b180f5998ea1 | |
| parent | 6db663d6141a6e0d3425f0e7e184c8b7922ba7c3 (diff) | |
| download | mariadb-git-4c4c0226a0bb43393b612c2a9a95dcbcae9e84d5.tar.gz | |
Fix build : declaration in the middle of statement in C file.
| -rw-r--r-- | storage/maria/ma_bitmap.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/storage/maria/ma_bitmap.c b/storage/maria/ma_bitmap.c index 607a31d630c..5b3be5d7bf4 100644 --- a/storage/maria/ma_bitmap.c +++ b/storage/maria/ma_bitmap.c @@ -152,6 +152,7 @@ static void _ma_bitmap_unpin_all(MARIA_SHARE *share); static inline my_bool write_changed_bitmap(MARIA_SHARE *share, MARIA_FILE_BITMAP *bitmap) { + my_bool res; DBUG_ENTER("write_changed_bitmap"); DBUG_ASSERT(share->pagecache->block_size == bitmap->block_size); DBUG_ASSERT(bitmap->file.write_callback != 0); @@ -169,7 +170,7 @@ static inline my_bool write_changed_bitmap(MARIA_SHARE *share, #endif ) { - my_bool res= pagecache_write(share->pagecache, + res= pagecache_write(share->pagecache, &bitmap->file, bitmap->page, 0, bitmap->map, PAGECACHE_PLAIN_PAGE, PAGECACHE_LOCK_LEFT_UNLOCKED, @@ -187,9 +188,9 @@ static inline my_bool write_changed_bitmap(MARIA_SHARE *share, be unpinned later by _ma_bitmap_unpin_all() as soon as non_flushable is set back to 0. */ - DBUG_PRINT("info", ("Writing pinned bitmap page")); MARIA_PINNED_PAGE page_link; - int res= pagecache_write(share->pagecache, + DBUG_PRINT("info", ("Writing pinned bitmap page")); + res= pagecache_write(share->pagecache, &bitmap->file, bitmap->page, 0, bitmap->map, PAGECACHE_PLAIN_PAGE, PAGECACHE_LOCK_LEFT_UNLOCKED, PAGECACHE_PIN, @@ -197,7 +198,7 @@ static inline my_bool write_changed_bitmap(MARIA_SHARE *share, LSN_IMPOSSIBLE); page_link.unlock= PAGECACHE_LOCK_LEFT_UNLOCKED; page_link.changed= 1; - push_dynamic(&bitmap->pinned_pages, (void*) &page_link); + push_dynamic(&bitmap->pinned_pages, (const uchar*) (void*) &page_link); DBUG_RETURN(res); } } |