← Back to branch summary

~xnox/ubuntu/saucy/drizzle/merge

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Clint Byrum
  • Date: 2012-06-19 10:46:49 UTC
  • mfrom: (1.2.11) (2.1.16 sid)
  • Revision ID: package-import@ubuntu.com-20120619104649-9ij634mxm4x8pp4l
Tags: 1:7.1.36-stable-1ubuntu1
https://launchpad.net/bugs/987575
* Merge from Debian unstable. (LP: #987575)
  Remaining changes:
  - Added upstart script.
* debian/drizzle.upstart: dropped logger since upstart logs job
  output now.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/include/ibuf0ibuf.ic
305
305
        before = ibuf_index_page_calc_free_bits(0, max_ins_size);
306
306
 
307
307
        if (max_ins_size >= increase) {
308
 
#if ULINT32_UNDEFINED <= UNIV_PAGE_SIZE
309
 
# error "ULINT32_UNDEFINED <= UNIV_PAGE_SIZE"
310
 
#endif
311
308
                after = ibuf_index_page_calc_free_bits(0, max_ins_size
312
309
                                                       - increase);
313
310
#ifdef UNIV_IBUF_DEBUG