← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/btr/btr0btr.c

  • Committer: Stewart Smith
  • Author(s): Marko Mäkelä, Stewart Smith
  • Date: 2010-11-17 05:41:53 UTC
  • mto: (2021.1.2 build)
  • mto: This revision was merged to the branch mainline in revision 1971.
  • Revision ID: stewart@flamingspork.com-20101117054153-ap3mtdgmdki1tan5
Merge Revision revid:marko.makela@oracle.com-20100623110659-pk5bqnmo0j7hj6md from MySQL InnoDB

Original revid:marko.makela@oracle.com-20100623110659-pk5bqnmo0j7hj6md

Original Authors: Marko Mkel <marko.makela@oracle.com>
Original commit message:
Bug#54728: Replace the dulint struct with a 64-bit integer.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/btr/btr0btr.c
737
737
        ulint           space,  /*!< in: space where created */
738
738
        ulint           zip_size,/*!< in: compressed page size in bytes
739
739
                                or 0 for uncompressed pages */
740
 
        dulint          index_id,/*!< in: index id */
 
740
        index_id_t      index_id,/*!< in: index id */
741
741
        dict_index_t*   index,  /*!< in: index */
742
742
        mtr_t*          mtr)    /*!< in: mini-transaction handle */
743
743
{
1020
1020
                /* In crash recovery, dict_index_is_sec_or_ibuf() always
1021
1021
                returns TRUE, even for clustered indexes.  max_trx_id is
1022
1022
                unused in clustered index pages. */
1023
 
                ut_ad(!ut_dulint_is_zero(max_trx_id) || recovery);
 
1023
                ut_ad(max_trx_id != 0 || recovery);
1024
1024
        }
1025
1025
 
1026
1026
        if (UNIV_LIKELY_NULL(page_zip)
2881
2881
                ibuf_reset_free_bits(block);
2882
2882
 
2883
2883
                if (page_is_leaf(buf_block_get_frame(block))) {
2884
 
                        ut_a(!ut_dulint_is_zero(max_trx_id));
 
2884
                        ut_a(max_trx_id);
2885
2885
                        page_set_max_trx_id(block,
2886
2886
                                            buf_block_get_page_zip(block),
2887
2887
                                            max_trx_id, mtr);