diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-08-01 15:08:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-08-01 15:08:33 +0200 |
| commit | 17a4a39c1557290f2712fdc921e3c0586619cf2e (patch) | |
| tree | 87aa8665b6b3e06dbe29381ca71d018787a80dd6 /storage/xtradb/buf | |
| parent | 6300f2f274bd9af0cdb599f15fbf55a66ba9ec56 (diff) | |
| parent | 1b0c81c917c215fad107d66c75cc2eb282bd8f4e (diff) | |
| download | mariadb-git-17a4a39c1557290f2712fdc921e3c0586619cf2e.tar.gz | |
Merge branch 'merge-xtradb-5.5' into 5.5
5.5.44-37.3
Diffstat (limited to 'storage/xtradb/buf')
| -rw-r--r-- | storage/xtradb/buf/buf0buf.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/xtradb/buf/buf0buf.c b/storage/xtradb/buf/buf0buf.c index f8966e9b15c..6ef9ac0d16a 100644 --- a/storage/xtradb/buf/buf0buf.c +++ b/storage/xtradb/buf/buf0buf.c @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1995, 2015, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. Portions of this file contain modifications contributed and copyrighted by @@ -1666,6 +1666,10 @@ buf_pool_watch_set( /* buf_pool->watch is protected by zip_mutex for now */ mutex_enter(&buf_pool->zip_mutex); + + /* The maximum number of purge threads should never exceed + BUF_POOL_WATCH_SIZE. So there is no way for purge thread + instance to hold a watch when setting another watch. */ for (i = 0; i < BUF_POOL_WATCH_SIZE; i++) { bpage = &buf_pool->watch[i]; |