← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • Committer: Mark Atwood
  • Date: 2011-08-10 21:48:03 UTC
  • mfrom: (2258.3.6 percona-sign-problem)
  • Revision ID: me@mark.atwood.name-20110810214803-5y47vom6tw7ssw0e
merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/fsp/fsp0fsp.cc
650
650
                                0 for uncompressed pages */
651
651
        ulint   offset)         /*!< in: page offset */
652
652
{
653
 
#ifndef DOXYGEN /* Doxygen gets confused of these */
654
 
# if UNIV_PAGE_SIZE <= XDES_ARR_OFFSET \
655
 
                + (UNIV_PAGE_SIZE / FSP_EXTENT_SIZE) * XDES_SIZE
656
 
#  error
657
 
# endif
658
 
# if PAGE_ZIP_MIN_SIZE <= XDES_ARR_OFFSET \
659
 
                + (PAGE_ZIP_MIN_SIZE / FSP_EXTENT_SIZE) * XDES_SIZE
660
 
#  error
661
 
# endif
662
 
#endif /* !DOXYGEN */
 
653
        ut_a(UNIV_PAGE_SIZE >
 
654
             XDES_ARR_OFFSET + (UNIV_PAGE_SIZE / FSP_EXTENT_SIZE) * XDES_SIZE);
 
655
        ut_a(PAGE_ZIP_MIN_SIZE >
 
656
             XDES_ARR_OFFSET +
 
657
             (PAGE_ZIP_MIN_SIZE / FSP_EXTENT_SIZE) * XDES_SIZE);
 
658
 
663
659
        ut_ad(ut_is_2pow(zip_size));
664
660
 
665
661
        if (!zip_size) {
1452
1448
                                                           mtr);
1453
1449
                xdes_init(descr, mtr);
1454
1450
 
1455
 
#if UNIV_PAGE_SIZE % FSP_EXTENT_SIZE
1456
 
# error "UNIV_PAGE_SIZE % FSP_EXTENT_SIZE != 0"
1457
 
#endif
1458
 
#if PAGE_ZIP_MIN_SIZE % FSP_EXTENT_SIZE
1459
 
# error "PAGE_ZIP_MIN_SIZE % FSP_EXTENT_SIZE != 0"
1460
 
#endif
1461
 
 
1462
1451
                if (UNIV_UNLIKELY(init_xdes)) {
1463
1452
 
1464
1453
                        /* The first page in the extent is a descriptor page