List:Commits« Previous MessageNext Message »
From:marko.makela Date:June 8 2010 11:40am
Subject:bzr commit into mysql-5.1-innodb branch (marko.makela:3502)
View as plain text  
#At file:///home/marko/innobase/dev/mysql2a/5.1-innodb/ based on revid:jimmy.yang@strippedwgbw0b8nlh

 3502 Marko Mäkelä	2010-06-08
      buf_page_get_gen(): Pass file,line to rw_lock_x_lock().

    modified:
      storage/innodb_plugin/buf/buf0buf.c
=== modified file 'storage/innodb_plugin/buf/buf0buf.c'
--- a/storage/innodb_plugin/buf/buf0buf.c	revid:jimmy.yang@oracle.com-20100603134448-itzduhwgbw0b8nlh
+++ b/storage/innodb_plugin/buf/buf0buf.c	revid:marko.makela@stripped08114055-7b04ytuqz0lde6v1
@@ -2236,7 +2236,7 @@ wait_until_unfixed:
 
 		block->page.buf_fix_count = 1;
 		buf_block_set_io_fix(block, BUF_IO_READ);
-		rw_lock_x_lock(&block->lock);
+		rw_lock_x_lock_func(&block->lock, 0, file, line);
 
 		UNIV_MEM_INVALID(bpage, sizeof *bpage);
 

Attachment: [text/bzr-bundle] bzr/marko.makela@oracle.com-20100608114055-7b04ytuqz0lde6v1.bundle
Thread
bzr commit into mysql-5.1-innodb branch (marko.makela:3502) marko.makela8 Jun