← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Jay Pipes
  • Date: 2008-09-09 20:10:57 UTC
  • mto: (383.2.4 fix-failing-tests)
  • mto: This revision was merged to the branch mainline in revision 386.
  • Revision ID: jay@mysql.com-20080909201057-3qkgcxqaps2s58y9
Re-enabled a number of passing tests from trunk

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 */
23
21
        fil_addr_t      addr,   /* in: file address */
24
22
        ulint           rw_latch, /* in: RW_S_LATCH, RW_X_LATCH */
25
23
        mtr_t*          mtr)    /* in: mtr handle */
26
24
{
27
 
        buf_block_t*    block;
28
 
        byte*           ptr;
 
25
        byte*   ptr;
29
26
 
 
27
        ut_ad(mtr);
30
28
        ut_ad(addr.boffset < UNIV_PAGE_SIZE);
31
29
        ut_ad((rw_latch == RW_S_LATCH) || (rw_latch == RW_X_LATCH));
32
30
 
33
 
        block = buf_page_get(space, zip_size, addr.page, rw_latch, mtr);
34
 
        ptr = buf_block_get_frame(block) + addr.boffset;
 
31
        ptr = buf_page_get(space, addr.page, rw_latch, mtr) + addr.boffset;
35
32
 
36
33
#ifdef UNIV_SYNC_DEBUG
37
 
        buf_block_dbg_add_level(block, SYNC_NO_ORDER_CHECK);
 
34
        buf_page_dbg_add_level(ptr, SYNC_NO_ORDER_CHECK);
38
35
#endif /* UNIV_SYNC_DEBUG */
39
36
 
40
37
        return(ptr);