← Back to branch summary

~mordred/percona-xtradb/drizzle-release-merge

« back to all changes in this revision

Viewing changes to buf/buf0buf.c

  • Committer: Monty Taylor
  • Date: 2008-12-31 21:04:12 UTC
  • mfrom: (17.1.3 percona-xtradb)
  • Revision ID: mordred@inaugust.com-20081231210412-j5ihwey17d47symt
Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
buf/buf0buf.c
1860
1860
        mtr_t*          mtr)    /* in: mini-transaction */
1861
1861
{
1862
1862
        buf_block_t*    block;
 
1863
        buf_page_t*     bpage= NULL;
1863
1864
        ibool           accessed;
1864
1865
        ulint           fix_type;
1865
1866
        ibool           must_read;
1882
1883
        //buf_pool_mutex_enter();
1883
1884
 
1884
1885
        if (block) {
1885
 
                block_mutex = buf_page_get_mutex(block);
 
1886
                bpage = &block->page;
 
1887
 
 
1888
                block_mutex = buf_page_get_mutex(bpage);
1886
1889
                mutex_enter(block_mutex);
1887
1890
 
1888
1891
                /* If the guess is a compressed page descriptor that
1911
1914
                mutex_enter(&page_hash_mutex);
1912
1915
                block = (buf_block_t*) buf_page_hash_get(space, offset);
1913
1916
                if (block) {
1914
 
                        block_mutex = buf_page_get_mutex(block);
 
1917
                        bpage = &block->page;
 
1918
                        block_mutex = buf_page_get_mutex(bpage);
1915
1919
                        mutex_enter(block_mutex);
1916
1920
                }
1917
1921
                mutex_exit(&page_hash_mutex);
1980
1984
 
1981
1985
                block = buf_LRU_get_free_block(0);
1982
1986
                ut_a(block);
1983
 
                block_mutex = buf_page_get_mutex(block);
 
1987
                bpage = &block->page;
 
1988
                block_mutex = buf_page_get_mutex(bpage);
1984
1989
 
1985
1990
                //buf_pool_mutex_enter();
1986
1991
                mutex_enter(&flush_list_mutex);
2001
2006
                                mutex_exit(block_mutex);
2002
2007
 
2003
2008
                                block = (buf_block_t*) hash_bpage;
2004
 
                                block_mutex = buf_page_get_mutex(block);
 
2009
                                bpage = &block->page;
 
2010
                                block_mutex = buf_page_get_mutex(bpage);
2005
2011
 
2006
2012
                                mutex_enter(block_mutex);
2007
2013
                                mutex_exit(&page_hash_mutex);