summaryrefslogtreecommitdiff
path: root/storage/xtradb/buf/buf0flu.cc
diff options
context:
space:
mode:
authorSergei Golubchik <sergii@pisem.net>2015-02-18 20:31:40 +0100
committerSergei Golubchik <sergii@pisem.net>2015-02-18 20:31:40 +0100
commit174bccd3ff02b3d7c3957f56027b0956425cb31f (patch)
tree99f3490019cd5902f4ae7a5f66ab073127affd00 /storage/xtradb/buf/buf0flu.cc
parent6b05688f6d8920171fe14453082101316fa2dd8e (diff)
parentdfb001edcd4b16bd4370b08b0176df78c4c5523f (diff)
downloadmariadb-git-174bccd3ff02b3d7c3957f56027b0956425cb31f.tar.gz
xtradb 5.6.22-72.0
Diffstat (limited to 'storage/xtradb/buf/buf0flu.cc')
-rw-r--r--storage/xtradb/buf/buf0flu.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/xtradb/buf/buf0flu.cc b/storage/xtradb/buf/buf0flu.cc
index ab48e4523b3..0f39c5de2ca 100644
--- a/storage/xtradb/buf/buf0flu.cc
+++ b/storage/xtradb/buf/buf0flu.cc
@@ -1093,8 +1093,8 @@ buf_flush_page(
# if defined UNIV_DEBUG || defined UNIV_IBUF_DEBUG
/********************************************************************//**
Writes a flushable page asynchronously from the buffer pool to a file.
-NOTE: block->mutex must be held upon entering this function, and it will be
-released by this function after flushing. This is loosely based on
+NOTE: block and LRU list mutexes must be held upon entering this function, and
+they will be released by this function after flushing. This is loosely based on
buf_flush_batch() and buf_flush_page().
@return TRUE if the page was flushed and the mutexes released */
UNIV_INTERN
@@ -1645,6 +1645,8 @@ buf_do_LRU_batch(
flush_counters_t* n) /*!< out: flushed/evicted page
counts */
{
+ ut_ad(mutex_own(&buf_pool->LRU_list_mutex));
+
if (buf_LRU_evict_from_unzip_LRU(buf_pool)) {
n->unzip_LRU_evicted
= buf_free_from_unzip_LRU_list_batch(buf_pool, max);