← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

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

  • 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/include/rem0rec.ic
269
269
        }
270
270
 
271
271
        if (UNIV_EXPECT(comp, REC_OFFS_COMPACT)) {
272
 
#if UNIV_PAGE_SIZE <= 32768
 
272
 
273
273
                /* Note that for 64 KiB pages, field_value can 'wrap around'
274
274
                and the debug assertion is not valid */
275
275
 
279
279
                the expression could be written simpler as
280
280
                (int16_t) field_value + ut_align_offset(...) < UNIV_PAGE_SIZE
281
281
                */
282
 
                ut_ad((field_value >= 32768
283
 
                       ? field_value - 65536
284
 
                       : field_value)
285
 
                      + ut_align_offset(rec, UNIV_PAGE_SIZE)
286
 
                      < UNIV_PAGE_SIZE);
287
 
#endif
 
282
                ut_ad((UNIV_PAGE_SIZE > 32768)
 
283
                      || ((field_value >= 32768
 
284
                           ? field_value - 65536
 
285
                           : field_value)
 
286
                          + ut_align_offset(rec, UNIV_PAGE_SIZE)
 
287
                          < UNIV_PAGE_SIZE));
 
288
 
288
289
                /* There must be at least REC_N_NEW_EXTRA_BYTES + 1
289
290
                between each record. */
290
291
                ut_ad((field_value > REC_N_NEW_EXTRA_BYTES
337
338
        field_value = mach_read_from_2(rec - REC_NEXT);
338
339
 
339
340
        if (UNIV_EXPECT(comp, REC_OFFS_COMPACT)) {
340
 
#if UNIV_PAGE_SIZE <= 32768
 
341
 
341
342
                /* Note that for 64 KiB pages, field_value can 'wrap around'
342
343
                and the debug assertion is not valid */
343
344
 
347
348
                the expression could be written simpler as
348
349
                (int16_t) field_value + ut_align_offset(...) < UNIV_PAGE_SIZE
349
350
                */
350
 
                ut_ad((field_value >= 32768
351
 
                       ? field_value - 65536
352
 
                       : field_value)
 
351
                ut_ad((UNIV_PAGE_SIZE > 32768)
 
352
                      || (field_value >= 32768
 
353
                          ? field_value - 65536
 
354
                          : field_value)
353
355
                      + ut_align_offset(rec, UNIV_PAGE_SIZE)
354
356
                      < UNIV_PAGE_SIZE);
355
 
#endif
 
357
 
356
358
                if (UNIV_UNLIKELY(field_value == 0)) {
357
359
 
358
360
                        return(0);