diff options
| author | Inaam Rana <inaam.rana@oracle.com> | 2012-03-15 13:34:50 -0400 |
|---|---|---|
| committer | Inaam Rana <inaam.rana@oracle.com> | 2012-03-15 13:34:50 -0400 |
| commit | 3c1bdb356d62bf207455cf5fb3206c1ca23034f8 (patch) | |
| tree | 9ae701d08c7000d1d162efb3bc7fee44182135ea /storage/innobase/ibuf | |
| parent | 1ca73ab4359a3a5db7c7e5c44993add2b5693bcb (diff) | |
| parent | 0023147055f7222a1d454e71729b0013af68881c (diff) | |
| download | mariadb-git-3c1bdb356d62bf207455cf5fb3206c1ca23034f8.tar.gz | |
merge from 5.1
Diffstat (limited to 'storage/innobase/ibuf')
| -rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c index eea7bbb7eec..e534e165c0c 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.c +++ b/storage/innobase/ibuf/ibuf0ibuf.c @@ -4428,7 +4428,7 @@ ibuf_merge_or_delete_for_page( function. When the counter is > 0, that prevents tablespace from being dropped. */ - tablespace_being_deleted = fil_inc_pending_ibuf_merges(space); + tablespace_being_deleted = fil_inc_pending_ops(space); if (UNIV_UNLIKELY(tablespace_being_deleted)) { /* Do not try to read the bitmap page from space; @@ -4454,7 +4454,7 @@ ibuf_merge_or_delete_for_page( /* No inserts buffered for this page */ if (!tablespace_being_deleted) { - fil_decr_pending_ibuf_merges(space); + fil_decr_pending_ops(space); } return; @@ -4753,7 +4753,7 @@ reset_bit: if (update_ibuf_bitmap && !tablespace_being_deleted) { - fil_decr_pending_ibuf_merges(space); + fil_decr_pending_ops(space); } #ifdef UNIV_IBUF_COUNT_DEBUG |