diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-02-22 21:45:24 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-02-22 21:45:24 +0100 |
| commit | f2cb45daf31087226632719e42a7ec66d8328e15 (patch) | |
| tree | e6b717c7cc07a0b48c642aa6b776f6a3360d6bf4 /storage/innobase/ibuf | |
| parent | 3653de82e5464fd9f5a239029171cbe9064c42d3 (diff) | |
| parent | 8366ce47608b602c8cac83fc1dca9fd52ccc5413 (diff) | |
| download | mariadb-git-f2cb45daf31087226632719e42a7ec66d8328e15.tar.gz | |
Merge remote-tracking branch 'origin/10.0' into 10.0
Diffstat (limited to 'storage/innobase/ibuf')
| -rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.cc b/storage/innobase/ibuf/ibuf0ibuf.cc index e4e7ecce53a..5fd0fdcb10a 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.cc +++ b/storage/innobase/ibuf/ibuf0ibuf.cc @@ -3893,7 +3893,7 @@ check_watch: { buf_page_t* bpage; buf_pool_t* buf_pool = buf_pool_get(space, page_no); - bpage = buf_page_hash_get(buf_pool, space, page_no); + bpage = buf_page_get_also_watch(buf_pool, space, page_no); if (UNIV_LIKELY_NULL(bpage)) { /* A buffer pool watch has been set or the |