mirror of
https://github.com/MariaDB/server.git
synced 2025-02-01 03:21:53 +01:00
branches/innodb+: buf_page_hash_get() returns NULL for watch sentinels.
Replace redundant !buf_pool_watch_is() conditions with ut_ad().
This commit is contained in:
parent
8c7bb285a3
commit
6a9d63eb2a
1 changed files with 6 additions and 3 deletions
|
@ -1820,7 +1820,8 @@ buf_page_set_file_page_was_freed(
|
|||
|
||||
bpage = buf_page_hash_get(space, offset);
|
||||
|
||||
if (bpage && !buf_pool_watch_is(bpage)) {
|
||||
if (bpage) {
|
||||
ut_ad(!buf_pool_watch_is(bpage));
|
||||
bpage->file_page_was_freed = TRUE;
|
||||
}
|
||||
|
||||
|
@ -1848,7 +1849,8 @@ buf_page_reset_file_page_was_freed(
|
|||
|
||||
bpage = buf_page_hash_get(space, offset);
|
||||
|
||||
if (bpage && !buf_pool_watch_is(bpage)) {
|
||||
if (bpage) {
|
||||
ut_ad(!buf_pool_watch_is(bpage));
|
||||
bpage->file_page_was_freed = FALSE;
|
||||
}
|
||||
|
||||
|
@ -1889,7 +1891,8 @@ buf_page_get_zip(
|
|||
buf_pool_mutex_enter();
|
||||
lookup:
|
||||
bpage = buf_page_hash_get(space, offset);
|
||||
if (bpage && !buf_pool_watch_is(bpage)) {
|
||||
if (bpage) {
|
||||
ut_ad(!buf_pool_watch_is(bpage));
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue