summaryrefslogtreecommitdiff
path: root/storage
diff options
context:
space:
mode:
authorSatya Bodapati <satya.bodapati@oracle.com>2014-02-28 12:45:53 +0530
committerSatya Bodapati <satya.bodapati@oracle.com>2014-02-28 12:45:53 +0530
commita559f6abf7d9abace0918d86df5b1f866737d8a3 (patch)
tree47ade66e6de9d10cf5a4530cd73cf1f15d115d37 /storage
parent3f2b13f979b3edc7d5c83060062aa5331273d918 (diff)
downloadmariadb-git-a559f6abf7d9abace0918d86df5b1f866737d8a3.tar.gz
Bug#18124788 - COMPRESSED TABLES REGRESSION FROM 5.6.13
After incrementing the number of pending uncompression operations, buffer pool zip mutex can be released immediately. Approved by Vasil. rb#4514
Diffstat (limited to 'storage')
-rw-r--r--storage/innobase/buf/buf0buf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c
index 13c68169f37..a799f3b8556 100644
--- a/storage/innobase/buf/buf0buf.c
+++ b/storage/innobase/buf/buf0buf.c
@@ -1,6 +1,6 @@
/*****************************************************************************
-Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2008, Google Inc.
Portions of this file contain modifications contributed and copyrighted by
@@ -2479,11 +2479,11 @@ wait_until_unfixed:
UNIV_MEM_INVALID(bpage, sizeof *bpage);
buf_pool->n_pend_unzip++;
+ mutex_exit(&buf_pool->zip_mutex);
buf_pool_mutex_exit(buf_pool);
access_time = buf_page_is_accessed(&block->page);
mutex_exit(&block->mutex);
- mutex_exit(&buf_pool->zip_mutex);
buf_page_free_descriptor(bpage);