Skip to content

Commit c121574

Browse files
committed
MDEV-15914: buf_pool_is_obsolete(): Add UNIV_UNLIKELY
1 parent 7b7e4d6 commit c121574

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

storage/innobase/include/buf0buf.ic

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Copyright (c) 1995, 2016, Oracle and/or its affiliates. All Rights Reserved.
44
Copyright (c) 2008, Google Inc.
5-
Copyright (c) 2014, 2017, MariaDB Corporation.
5+
Copyright (c) 2014, 2018, MariaDB Corporation.
66

77
Portions of this file contain modifications contributed and copyrighted by
88
Google, Inc. Those modifications are gratefully acknowledged and are described
@@ -1424,8 +1424,8 @@ bool
14241424
buf_pool_is_obsolete(
14251425
ulint withdraw_clock)
14261426
{
1427-
return(buf_pool_withdrawing
1428-
|| buf_withdraw_clock != withdraw_clock);
1427+
return(UNIV_UNLIKELY(buf_pool_withdrawing
1428+
|| buf_withdraw_clock != withdraw_clock));
14291429
}
14301430

14311431
/** Calculate aligned buffer pool size based on srv_buf_pool_chunk_unit,

0 commit comments

Comments
 (0)