diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2015-01-21 14:33:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2015-01-21 14:33:39 +0100 |
| commit | 476a8660e6472d68ea3faa221733e0f5f7fcdd64 (patch) | |
| tree | 23a2ac20dfcea78d0b223dbdd10da21a5a439366 /storage/innobase/ibuf | |
| parent | ff55d900fbeb1d426e7737caef6748c3f13bf4e6 (diff) | |
| parent | 06ae6c6dfe6e1e3225815ab0de070db3475eefa1 (diff) | |
| download | mariadb-git-476a8660e6472d68ea3faa221733e0f5f7fcdd64.tar.gz | |
InnoDB 5.6.22
Diffstat (limited to 'storage/innobase/ibuf')
| -rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc index 0bb898dbce5..2082c0d194b 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.cc +++ b/storage/innobase/ibuf/ibuf0ibuf.cc @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1997, 2013, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1997, 2014, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -4614,7 +4614,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_ops(space); + tablespace_being_deleted = fil_inc_pending_ops(space, true); if (UNIV_UNLIKELY(tablespace_being_deleted)) { /* Do not try to read the bitmap page from space; |