← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/include/page0zip.ic

  • 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:
plugin/innobase/include/page0zip.ic
174
174
        ut_ad(ut_is_2pow(zip_size));
175
175
        ut_ad(comp || !zip_size);
176
176
 
177
 
#if UNIV_PAGE_SIZE > REC_MAX_DATA_SIZE
178
 
        if (UNIV_UNLIKELY(rec_size >= REC_MAX_DATA_SIZE)) {
179
 
                return(TRUE);
180
 
        }
181
 
#endif
182
 
 
183
177
        if (UNIV_UNLIKELY(zip_size)) {
184
178
                ut_ad(comp);
185
179
                /* On a compressed page, there is a two-byte entry in