← Back to branch summary

~james-page/ubuntu/precise/mysql-5.5/misc-fixes

« back to all changes in this revision

Viewing changes to storage/innobase/ibuf/ibuf0ibuf.c

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-06-11 07:34:33 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120611073433-l9za2ni4ipp848y3
Tags: 5.5.24-0ubuntu0.12.04.1
https://launchpad.net/bugs/1011371
* SECURITY UPDATE: Update to 5.5.24 to fix security issues (LP: #1011371)
  - http://dev.mysql.com/doc/refman/5.5/en/news-5-5-24.html

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/ibuf/ibuf0ibuf.c
4428
4428
                function. When the counter is > 0, that prevents tablespace
4429
4429
                from being dropped. */
4430
4430
 
4431
 
                tablespace_being_deleted = fil_inc_pending_ibuf_merges(space);
 
4431
                tablespace_being_deleted = fil_inc_pending_ops(space);
4432
4432
 
4433
4433
                if (UNIV_UNLIKELY(tablespace_being_deleted)) {
4434
4434
                        /* Do not try to read the bitmap page from space;
4454
4454
                                /* No inserts buffered for this page */
4455
4455
 
4456
4456
                                if (!tablespace_being_deleted) {
4457
 
                                        fil_decr_pending_ibuf_merges(space);
 
4457
                                        fil_decr_pending_ops(space);
4458
4458
                                }
4459
4459
 
4460
4460
                                return;
4753
4753
 
4754
4754
        if (update_ibuf_bitmap && !tablespace_being_deleted) {
4755
4755
 
4756
 
                fil_decr_pending_ibuf_merges(space);
 
4756
                fil_decr_pending_ops(space);
4757
4757
        }
4758
4758
 
4759
4759
#ifdef UNIV_IBUF_COUNT_DEBUG