diff options
Diffstat (limited to 'storage/innobase/include/btr0btr.ic')
| -rw-r--r-- | storage/innobase/include/btr0btr.ic | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/storage/innobase/include/btr0btr.ic b/storage/innobase/include/btr0btr.ic index 55bdb289b21..6f7a66b12ac 100644 --- a/storage/innobase/include/btr0btr.ic +++ b/storage/innobase/include/btr0btr.ic @@ -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., 59 Temple -Place, Suite 330, Boston, MA 02111-1307 USA +this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA *****************************************************************************/ @@ -81,7 +81,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), @@ -156,7 +156,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), @@ -199,7 +199,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 { @@ -236,7 +236,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 { @@ -272,7 +272,7 @@ 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", |