bzr commit into mysql-trunk-innodb branch (marko.makela:3097)

[marko.makela]

#At file:///home/marko/innobase/dev/mysql2a/5.5-innodb/ based on revid:vasil.dimov@strippedufflkqhsbme

 3097 Marko Mäkelä	2010-06-08
      Merge a change from mysql-5.1-innodb:
      ------------------------------------------------------------
      revno: 3502
      revision-id: marko.makela@stripped055-7b04ytuqz0lde6v1
      parent: jimmy.yang@stripped20100603134448-itzduhwgbw0b8nlh
      committer: Marko Mnnodb
      timestamp: Tue 2010-06-08 14:40:55 +0300
      message:
        buf_page_get_gen(): Pass file,line to rw_lock_x_lock().

    modified:
      storage/innobase/buf/buf0buf.c
=== modified file 'storage/innobase/buf/buf0buf.c'
--- a/storage/innobase/buf/buf0buf.c	revid:vasil.dimov@stripped
+++ b/storage/innobase/buf/buf0buf.c	revid:marko.makela@stripped-20100608114734-zr70kxe26ztgwbat
@@ -2957,7 +2957,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/[e-mail]