1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix build : declaration in the middle of statement in C file.

Browse Source
This commit is contained in:
Vladislav Vaintroub 2011-02-10 21:04:29 +01:00
parent 6db663d614
commit 4c4c0226a0
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
storage/maria/ma_bitmap.c
View File

@ -152,6 +152,7 @@ static void _ma_bitmap_unpin_all(MARIA_SHARE *share);
static inline my_bool write_changed_bitmap(MARIA_SHARE *share, static inline my_bool write_changed_bitmap(MARIA_SHARE *share,
MARIA_FILE_BITMAP *bitmap) MARIA_FILE_BITMAP *bitmap)
{ {
my_bool res;
DBUG_ENTER("write_changed_bitmap"); DBUG_ENTER("write_changed_bitmap");
DBUG_ASSERT(share->pagecache->block_size == bitmap->block_size); DBUG_ASSERT(share->pagecache->block_size == bitmap->block_size);
DBUG_ASSERT(bitmap->file.write_callback != 0); DBUG_ASSERT(bitmap->file.write_callback != 0);
@ -169,7 +170,7 @@ static inline my_bool write_changed_bitmap(MARIA_SHARE *share,
#endif #endif
) )
{ {
my_bool res= pagecache_write(share->pagecache, res= pagecache_write(share->pagecache,
&bitmap->file, bitmap->page, 0, &bitmap->file, bitmap->page, 0,
bitmap->map, PAGECACHE_PLAIN_PAGE, bitmap->map, PAGECACHE_PLAIN_PAGE,
PAGECACHE_LOCK_LEFT_UNLOCKED, 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 be unpinned later by _ma_bitmap_unpin_all() as soon as non_flushable
is set back to 0. is set back to 0.
*/ */
DBUG_PRINT("info", ("Writing pinned bitmap page"));
MARIA_PINNED_PAGE page_link; 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->file, bitmap->page, 0,
bitmap->map, PAGECACHE_PLAIN_PAGE, bitmap->map, PAGECACHE_PLAIN_PAGE,
PAGECACHE_LOCK_LEFT_UNLOCKED, PAGECACHE_PIN, PAGECACHE_LOCK_LEFT_UNLOCKED, PAGECACHE_PIN,
@ -197,7 +198,7 @@ static inline my_bool write_changed_bitmap(MARIA_SHARE *share,
LSN_IMPOSSIBLE); LSN_IMPOSSIBLE);
page_link.unlock= PAGECACHE_LOCK_LEFT_UNLOCKED; page_link.unlock= PAGECACHE_LOCK_LEFT_UNLOCKED;
page_link.changed= 1; 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); DBUG_RETURN(res);
} }
} }