diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-06-05 02:06:51 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-06-05 02:06:51 +0200 |
| commit | f84f577aa15a193f24c3119eafdee554cb9775fb (patch) | |
| tree | ee531580839374516db09b2409ec4bd57a847e8a /storage/innobase/buf | |
| parent | f07b3463e7a4ff32316e1cc94d553b5009ac51f2 (diff) | |
| parent | 31c803e8d0543b330aa8e61ef878da43fe1f68f7 (diff) | |
| download | mariadb-git-f84f577aa15a193f24c3119eafdee554cb9775fb.tar.gz | |
Merge tag 'mysql-5.5.44' into bb-5.5-serg
Diffstat (limited to 'storage/innobase/buf')
| -rw-r--r-- | storage/innobase/buf/buf0buf.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/storage/innobase/buf/buf0buf.c b/storage/innobase/buf/buf0buf.c index b6bfcc3dbc0..4963f1c30c3 100644 --- a/storage/innobase/buf/buf0buf.c +++ b/storage/innobase/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 @@ -1528,6 +1528,9 @@ buf_pool_watch_set( return(NULL); } + /* 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]; |