← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Brian Aker
  • Date: 2011-01-05 16:29:27 UTC
  • mto: (2060.2.1 clean)
  • mto: This revision was merged to the branch mainline in revision 2063.
  • Revision ID: brian@tangent.org-20110105162927-fi2gnmlz35qcagik
Add additional gperf for non-reserved SQL keywords.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/fsp/fsp0fsp.c
899
899
fsp_parse_init_file_page(
900
900
/*=====================*/
901
901
        byte*           ptr,    /*!< in: buffer */
902
 
        byte*           /*end_ptr __attribute__((unused))*/, /*!< in: buffer end */
 
902
        byte*           end_ptr __attribute__((unused)), /*!< in: buffer end */
903
903
        buf_block_t*    block)  /*!< in: block or NULL */
904
904
{
905
905
        ut_ad(ptr && end_ptr);
1810
1810
/*=============================*/
1811
1811
        page_t* page,   /*!< in: segment inode page */
1812
1812
        ulint   i,      /*!< in: inode index on page */
1813
 
        ulint   /*zip_size __attribute__((unused))*/,
 
1813
        ulint   zip_size __attribute__((unused)),
1814
1814
                        /*!< in: compressed page size, or 0 */
1815
 
        mtr_t*  /*mtr __attribute__((unused))*/)
 
1815
        mtr_t*  mtr __attribute__((unused)))
1816
1816
                        /*!< in: mini-transaction handle */
1817
1817
{
1818
1818
        ut_ad(i < FSP_SEG_INODES_PER_PAGE(zip_size));
2111
2111
/*======================*/
2112
2112
        fseg_inode_t*   inode,  /*!< in: segment inode */
2113
2113
        ulint           n,      /*!< in: slot index */
2114
 
        mtr_t*          /*mtr __attribute__((unused))*/) /*!< in: mtr handle */
 
2114
        mtr_t*          mtr __attribute__((unused))) /*!< in: mtr handle */
2115
2115
{
2116
2116
        ut_ad(inode && mtr);
2117
2117
        ut_ad(n < FSEG_FRAG_ARR_N_SLOTS);
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           page_zip_size = dict_table_flags_to_zip_size(
 
2774
                ulint           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, page_zip_size, mtr);
 
2777
                block = buf_page_create(space, ret_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, page_zip_size,
 
2780
                if (UNIV_UNLIKELY(block != buf_page_get(space, 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, page_zip_size, ret_page, mtr)
 
2793
                ut_ad(xdes_get_descriptor(space, 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, page_zip_size, ret_page, mtr);
 
2798
                fseg_mark_page_used(seg_inode, space, zip_size, ret_page, mtr);
2799
2799
        }
2800
2800
 
2801
2801
        buf_reset_check_index_page_at_flush(space, ret_page);