← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to plugin/innobase/buf/buf0lru.c

Merge Stewart - Update innobase plugin to be based on innodb 1.1.4 from MySQL 5.5.8 

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugin/innobase/buf/buf0lru.c
357
357
                prev_bpage = UT_LIST_GET_PREV(LRU, bpage);
358
358
 
359
359
                /* bpage->space and bpage->io_fix are protected by
360
 
                buf_pool_mutex and block_mutex.  It is safe to check
361
 
                them while holding buf_pool_mutex only. */
 
360
                buf_pool->mutex and block_mutex.  It is safe to check
 
361
                them while holding buf_pool->mutex only. */
362
362
 
363
363
                if (buf_page_get_space(bpage) != id) {
364
364
                        /* Skip this block, as it does not belong to
404
404
                                                /* Descriptors of uncompressed
405
405
                                                blocks will not be relocated,
406
406
                                                because we are holding the
407
 
                                                buf_pool_mutex. */
 
407
                                                buf_pool->mutex. */
408
408
                                                break;
409
409
                                        case BUF_BLOCK_ZIP_PAGE:
410
410
                                        case BUF_BLOCK_ZIP_DIRTY:
1444
1444
page, the descriptor object will be freed as well.
1445
1445
 
1446
1446
NOTE: If this function returns BUF_LRU_FREED, it will temporarily
1447
 
release buf_pool_mutex.  Furthermore, the page frame will no longer be
 
1447
release buf_pool->mutex.  Furthermore, the page frame will no longer be
1448
1448
accessible via bpage.
1449
1449
 
1450
 
The caller must hold buf_pool_mutex and buf_page_get_mutex(bpage) and
 
1450
The caller must hold buf_pool->mutex and buf_page_get_mutex(bpage) and
1451
1451
release these two mutexes after the call.  No other
1452
1452
buf_page_get_mutex() may be held when calling this function.
1453
1453
@return BUF_LRU_FREED if freed, BUF_LRU_CANNOT_RELOCATE or