Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-single-user
into whalegate.ndb.mysql.com:/home/tomas/mysql-5.1-build
This commit is contained in:
commit
2c06863b09
@ -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…
x
Reference in New Issue
Block a user