diff options
Diffstat (limited to 'storage/xtradb/include/btr0btr.ic')
| -rw-r--r-- | storage/xtradb/include/btr0btr.ic | 33 |
1 files changed, 9 insertions, 24 deletions
diff --git a/storage/xtradb/include/btr0btr.ic b/storage/xtradb/include/btr0btr.ic index 21eaa9bd026..9cc611ee450 100644 --- a/storage/xtradb/include/btr0btr.ic +++ b/storage/xtradb/include/btr0btr.ic @@ -1,6 +1,6 @@ /***************************************************************************** -Copyright (c) 1994, 2011, Oracle and/or its affiliates. All Rights Reserved. +Copyright (c) 1994, 2012, Oracle and/or its affiliates. All Rights Reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software @@ -11,8 +11,8 @@ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with -this program; if not, write to the Free Software Foundation, Inc., -51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ @@ -83,7 +83,7 @@ btr_page_set_index_id( index_id_t id, /*!< in: index id */ mtr_t* mtr) /*!< in: mtr */ { - if (UNIV_LIKELY_NULL(page_zip)) { + if (page_zip) { mach_write_to_8(page + (PAGE_HEADER + PAGE_INDEX_ID), id); page_zip_write_header(page_zip, page + (PAGE_HEADER + PAGE_INDEX_ID), @@ -128,22 +128,6 @@ btr_page_get_level_low( } /********************************************************//** -Gets the node level field in an index page. -@return level, leaf level == 0 */ -UNIV_INLINE -ulint -btr_page_get_level( -/*===============*/ - const page_t* page, /*!< in: index page */ - mtr_t* mtr __attribute__((unused))) - /*!< in: mini-transaction handle */ -{ - ut_ad(page && mtr); - - return(btr_page_get_level_low(page)); -} - -/********************************************************//** Sets the node level field in an index page. */ UNIV_INLINE void @@ -158,7 +142,7 @@ btr_page_set_level( ut_ad(page && mtr); ut_ad(level <= BTR_MAX_NODE_LEVEL); - if (UNIV_LIKELY_NULL(page_zip)) { + if (page_zip) { mach_write_to_2(page + (PAGE_HEADER + PAGE_LEVEL), level); page_zip_write_header(page_zip, page + (PAGE_HEADER + PAGE_LEVEL), @@ -201,7 +185,7 @@ btr_page_set_next( { ut_ad(page && mtr); - if (UNIV_LIKELY_NULL(page_zip)) { + if (page_zip) { mach_write_to_4(page + FIL_PAGE_NEXT, next); page_zip_write_header(page_zip, page + FIL_PAGE_NEXT, 4, mtr); } else { @@ -238,7 +222,7 @@ btr_page_set_prev( { ut_ad(page && mtr); - if (UNIV_LIKELY_NULL(page_zip)) { + if (page_zip) { mach_write_to_4(page + FIL_PAGE_PREV, prev); page_zip_write_header(page_zip, page + FIL_PAGE_PREV, 4, mtr); } else { @@ -274,12 +258,13 @@ btr_node_ptr_get_child_page_no( page_no = mach_read_from_4(field); - if (UNIV_UNLIKELY(page_no == 0)) { + if (page_no == 0) { fprintf(stderr, "InnoDB: a nonsensical page number 0" " in a node ptr record at offset %lu\n", (ulong) page_offset(rec)); buf_page_print(page_align(rec), 0, 0); + ut_ad(0); } return(page_no); |