diff options
| author | Marko Mäkelä <marko.makela@oracle.com> | 2011-09-13 09:21:39 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@oracle.com> | 2011-09-13 09:21:39 +0300 |
| commit | 3312a023b13a53e9bfb07e5444bdf3a02b33ef86 (patch) | |
| tree | 9b1740b93d98a78827f1fa22e965e509fc91af63 /storage | |
| parent | 741efeedb59c02e0c239779cc65b112e07adf417 (diff) | |
| parent | 3436169892e8aa57128d8046631bf381b75b113d (diff) | |
| download | mariadb-git-3312a023b13a53e9bfb07e5444bdf3a02b33ef86.tar.gz | |
Merge mysql-5.1 to mysql-5.5.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/ibuf/ibuf0ibuf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/ibuf/ibuf0ibuf.c b/storage/innobase/ibuf/ibuf0ibuf.c index 054a2d364b6..7f6acb2b042 100644 --- a/storage/innobase/ibuf/ibuf0ibuf.c +++ b/storage/innobase/ibuf/ibuf0ibuf.c @@ -2214,13 +2214,13 @@ ibuf_add_free_page(void) mutex_enter(&ibuf_mutex); + root = ibuf_tree_root_get(&mtr); + buf_block_dbg_add_level(block, SYNC_IBUF_TREE_NODE_NEW); page = buf_block_get_frame(block); } - root = ibuf_tree_root_get(&mtr); - /* Add the page to the free list and update the ibuf size data */ flst_add_last(root + PAGE_HEADER + PAGE_BTR_IBUF_FREE_LIST, |