diff options
Diffstat (limited to 'storage/innobase/include/btr0btr.ic')
| -rw-r--r-- | storage/innobase/include/btr0btr.ic | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/storage/innobase/include/btr0btr.ic b/storage/innobase/include/btr0btr.ic index c24b1603bd2..1f39b52f3c8 100644 --- a/storage/innobase/include/btr0btr.ic +++ b/storage/innobase/include/btr0btr.ic @@ -109,7 +109,7 @@ btr_page_set_level( ut_ad(level <= BTR_MAX_NODE_LEVEL); mlog_write_ulint(page + PAGE_HEADER + PAGE_LEVEL, level, - MLOG_2BYTES, mtr); + MLOG_2BYTES, mtr); } /************************************************************ @@ -124,9 +124,9 @@ btr_page_get_next( { ut_ad(page && mtr); ut_ad(mtr_memo_contains(mtr, buf_block_align(page), - MTR_MEMO_PAGE_X_FIX) - || mtr_memo_contains(mtr, buf_block_align(page), - MTR_MEMO_PAGE_S_FIX)); + MTR_MEMO_PAGE_X_FIX) + || mtr_memo_contains(mtr, buf_block_align(page), + MTR_MEMO_PAGE_S_FIX)); return(mach_read_from_4(page + FIL_PAGE_NEXT)); } @@ -194,7 +194,7 @@ btr_node_ptr_get_child_page_no( /* The child address is in the last field */ field = rec_get_nth_field(rec, offsets, - rec_offs_n_fields(offsets) - 1, &len); + rec_offs_n_fields(offsets) - 1, &len); ut_ad(len == 4); @@ -202,7 +202,8 @@ btr_node_ptr_get_child_page_no( if (UNIV_UNLIKELY(page_no == 0)) { fprintf(stderr, -"InnoDB: a nonsensical page number 0 in a node ptr record at offset %lu\n", + "InnoDB: a nonsensical page number 0" + " in a node ptr record at offset %lu\n", (ulong) ut_align_offset(rec, UNIV_PAGE_SIZE)); buf_page_print(buf_frame_align(rec)); } @@ -221,13 +222,13 @@ btr_leaf_page_release( mtr_t* mtr) /* in: mtr */ { ut_ad(!mtr_memo_contains(mtr, buf_block_align(page), - MTR_MEMO_MODIFY)); + MTR_MEMO_MODIFY)); if (latch_mode == BTR_SEARCH_LEAF) { mtr_memo_release(mtr, buf_block_align(page), - MTR_MEMO_PAGE_S_FIX); + MTR_MEMO_PAGE_S_FIX); } else { ut_ad(latch_mode == BTR_MODIFY_LEAF); mtr_memo_release(mtr, buf_block_align(page), - MTR_MEMO_PAGE_X_FIX); + MTR_MEMO_PAGE_X_FIX); } } |