~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/page/page0zip.cc

  • Committer: Olaf van der Spek
  • Date: 2011-08-11 09:18:19 UTC
  • mfrom: (2395 drizzle)
  • mto: This revision was merged to the branch mainline in revision 2396.
  • Revision ID: olafvdspek@gmail.com-20110811091819-em9vnmtco1zt6uvm
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
49
49
 
50
50
#ifndef UNIV_HOTBACKUP
51
51
/** Statistics on compression, indexed by page_zip_des_t::ssize - 1 */
52
 
UNIV_INTERN page_zip_stat_t page_zip_stat[PAGE_ZIP_NUM_SSIZE - 1];
 
52
UNIV_INTERN page_zip_stat_t page_zip_stat[PAGE_ZIP_NUM_SSIZE_MAX - 1];
53
53
#endif /* !UNIV_HOTBACKUP */
54
54
 
55
55
/* Please refer to ../include/page0zip.ic for a description of the
590
590
#if PAGE_ZIP_DIR_SLOT_MASK & (PAGE_ZIP_DIR_SLOT_MASK + 1)
591
591
# error "PAGE_ZIP_DIR_SLOT_MASK is not 1 less than a power of 2"
592
592
#endif
593
 
#if PAGE_ZIP_DIR_SLOT_MASK < UNIV_PAGE_SIZE - 1
594
 
# error "PAGE_ZIP_DIR_SLOT_MASK < UNIV_PAGE_SIZE - 1"
595
 
#endif
596
593
                if (UNIV_UNLIKELY(rec_get_n_owned_new(rec))) {
597
594
                        offs |= PAGE_ZIP_DIR_SLOT_OWNED;
598
595
                }