diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-25 09:37:14 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-26 22:53:33 +0300 |
| commit | c121574dff27cb0de2a9ac77b5f5394c9be705f2 (patch) | |
| tree | 0f13ac2f594d0c04c1999dc8182b4ad5a822f2b8 | |
| parent | 7b7e4d679a709a5d7c74322b6d2fc6f8d099c90b (diff) | |
| download | mariadb-git-c121574dff27cb0de2a9ac77b5f5394c9be705f2.tar.gz | |
MDEV-15914: buf_pool_is_obsolete(): Add UNIV_UNLIKELY
| -rw-r--r-- | storage/innobase/include/buf0buf.ic | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/innobase/include/buf0buf.ic b/storage/innobase/include/buf0buf.ic index 38c52d5e608..1bfce325106 100644 --- a/storage/innobase/include/buf0buf.ic +++ b/storage/innobase/include/buf0buf.ic @@ -2,7 +2,7 @@ Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2008, Google Inc. -Copyright (c) 2014, 2017, MariaDB Corporation. +Copyright (c) 2014, 2018, MariaDB Corporation. Portions of this file contain modifications contributed and copyrighted by Google, Inc. Those modifications are gratefully acknowledged and are described @@ -1424,8 +1424,8 @@ bool buf_pool_is_obsolete( ulint withdraw_clock) { - return(buf_pool_withdrawing - || buf_withdraw_clock != withdraw_clock); + return(UNIV_UNLIKELY(buf_pool_withdrawing + || buf_withdraw_clock != withdraw_clock)); } /** Calculate aligned buffer pool size based on srv_buf_pool_chunk_unit, |