#At file:///home/alik/MySQL/bzr/00.merge/mysql-trunk-bugfixing/ based on revid:anitha.gopi@stripped
3455 Alexander Nozdrin 2010-12-21 [merge]
Auto-merge from mysql-trunk-innodb.
modified:
storage/innobase/buf/buf0buf.c
storage/innobase/handler/i_s.cc
=== modified file 'storage/innobase/buf/buf0buf.c'
--- a/storage/innobase/buf/buf0buf.c 2010-12-10 15:37:43 +0000
+++ b/storage/innobase/buf/buf0buf.c 2010-12-21 02:47:12 +0000
@@ -4194,7 +4194,7 @@ buf_page_monitor(
frame = bpage->zip.data
? bpage->zip.data
- : buf_block_get_frame((buf_block_t*) bpage);
+ : ((buf_block_t*) bpage)->frame;
switch(fil_page_get_type(frame)) {
ulint level;
=== modified file 'storage/innobase/handler/i_s.cc'
--- a/storage/innobase/handler/i_s.cc 2010-12-15 04:37:25 +0000
+++ b/storage/innobase/handler/i_s.cc 2010-12-21 02:47:12 +0000
@@ -3283,7 +3283,7 @@ i_s_innodb_buffer_page_get_info(
block = reinterpret_cast<const buf_block_t*>(bpage);
- frame = buf_block_get_frame(block);
+ frame = block->frame;
page_type = fil_page_get_type(frame);
No bundle (reason: revision is a merge).
| Thread |
|---|
| • bzr commit into mysql-trunk-mtr branch (alexander.nozdrin:3455) | Alexander Nozdrin | 21 Dec |
