← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/include/fut0fut.ic

  • Committer: Brian Aker
  • Date: 2008-11-04 15:39:09 UTC
  • mfrom: (575.1.2 devel)
  • Revision ID: brian@tangent.org-20081104153909-c72hn65udxs1ccal
Merge of Monty's work

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/include/fut0fut.ic
18
18
                                /* out: pointer to a byte in a frame; the file
19
19
                                page in the frame is bufferfixed and latched */
20
20
        ulint           space,  /* in: space id */
 
21
        ulint           zip_size,/* in: compressed page size in bytes
 
22
                                or 0 for uncompressed pages */
21
23
        fil_addr_t      addr,   /* in: file address */
22
24
        ulint           rw_latch, /* in: RW_S_LATCH, RW_X_LATCH */
23
25
        mtr_t*          mtr)    /* in: mtr handle */
24
26
{
25
 
        byte*   ptr;
 
27
        buf_block_t*    block;
 
28
        byte*           ptr;
26
29
 
27
 
        ut_ad(mtr);
28
30
        ut_ad(addr.boffset < UNIV_PAGE_SIZE);
29
31
        ut_ad((rw_latch == RW_S_LATCH) || (rw_latch == RW_X_LATCH));
30
32
 
31
 
        ptr = buf_page_get(space, addr.page, rw_latch, mtr) + addr.boffset;
 
33
        block = buf_page_get(space, zip_size, addr.page, rw_latch, mtr);
 
34
        ptr = buf_block_get_frame(block) + addr.boffset;
32
35
 
33
36
#ifdef UNIV_SYNC_DEBUG
34
 
        buf_page_dbg_add_level(ptr, SYNC_NO_ORDER_CHECK);
 
37
        buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK);
35
38
#endif /* UNIV_SYNC_DEBUG */
36
39
 
37
40
        return(ptr);