mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-telco-gca
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user storage/ndb/src/kernel/blocks/pgman.cpp: Auto merged
This commit is contained in:
commit
b5445c151b
1 changed files with 7 additions and 0 deletions
|
@ -668,6 +668,7 @@ Pgman::lirs_reference(Ptr<Page_entry> ptr)
|
|||
jam();
|
||||
move_cleanup_ptr(ptr);
|
||||
pl_queue.remove(ptr);
|
||||
state &= ~ Page_entry::ONQUEUE;
|
||||
}
|
||||
if (state & Page_entry::BOUND)
|
||||
{
|
||||
|
@ -698,6 +699,12 @@ Pgman::lirs_reference(Ptr<Page_entry> ptr)
|
|||
pl_stack.add(ptr);
|
||||
state |= Page_entry::ONSTACK;
|
||||
state |= Page_entry::HOT;
|
||||
// it could be on queue already
|
||||
if (state & Page_entry::ONQUEUE) {
|
||||
jam();
|
||||
pl_queue.remove(ptr);
|
||||
state &= ~Page_entry::ONQUEUE;
|
||||
}
|
||||
}
|
||||
|
||||
set_page_state(ptr, state);
|
||||
|
|
Loading…
Reference in a new issue