← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/fsp/fsp0fsp.cc

  • Committer: Monty Taylor
  • Date: 2010-12-26 23:42:28 UTC
  • mto: This revision was merged to the branch mainline in revision 2038.
  • Revision ID: mordred@inaugust.com-20101226234228-80mnll8m2jhsc3pu
Wow. Got rid of most of INNOBASE_SKIP_WARNINGS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/fsp/fsp0fsp.cc
2771
2771
                can be obtained immediately with buf_page_get without need
2772
2772
                for a disk read */
2773
2773
                buf_block_t*    block;
2774
 
                ulint           zip_size = dict_table_flags_to_zip_size(
 
2774
                ulint           page_zip_size = dict_table_flags_to_zip_size(
2775
2775
                        mach_read_from_4(FSP_SPACE_FLAGS + space_header));
2776
2776
 
2777
 
                block = buf_page_create(space, ret_page, zip_size, mtr);
 
2777
                block = buf_page_create(space, ret_page, page_zip_size, mtr);
2778
2778
                buf_block_dbg_add_level(block, SYNC_FSP_PAGE);
2779
2779
 
2780
 
                if (UNIV_UNLIKELY(block != buf_page_get(space, zip_size,
 
2780
                if (UNIV_UNLIKELY(block != buf_page_get(space, page_zip_size,
2781
2781
                                                        ret_page, RW_X_LATCH,
2782
2782
                                                        mtr))) {
2783
2783
                        ut_error;
2790
2790
                The extent is still in the appropriate list (FSEG_NOT_FULL
2791
2791
                or FSEG_FREE), and the page is not yet marked as used. */
2792
2792
 
2793
 
                ut_ad(xdes_get_descriptor(space, zip_size, ret_page, mtr)
 
2793
                ut_ad(xdes_get_descriptor(space, page_zip_size, ret_page, mtr)
2794
2794
                      == ret_descr);
2795
2795
                ut_ad(xdes_get_bit(ret_descr, XDES_FREE_BIT,
2796
2796
                                   ret_page % FSP_EXTENT_SIZE, mtr) == TRUE);
2797
2797
 
2798
 
                fseg_mark_page_used(seg_inode, space, zip_size, ret_page, mtr);
 
2798
                fseg_mark_page_used(seg_inode, space, page_zip_size, ret_page, mtr);
2799
2799
        }
2800
2800
 
2801
2801
        buf_reset_check_index_page_at_flush(space, ret_page);