diff options
| -rw-r--r-- | storage/innobase/buf/buf0lru.cc | 5 | ||||
| -rw-r--r-- | storage/innobase/include/fil0fil.h | 5 | ||||
| -rw-r--r-- | storage/innobase/include/page0page.h | 4 | ||||
| -rw-r--r-- | storage/innobase/include/page0page.ic | 2 |
4 files changed, 7 insertions, 9 deletions
diff --git a/storage/innobase/buf/buf0lru.cc b/storage/innobase/buf/buf0lru.cc index 1e7b7065b12..2137760e815 100644 --- a/storage/innobase/buf/buf0lru.cc +++ b/storage/innobase/buf/buf0lru.cc @@ -2697,14 +2697,13 @@ buf_LRU_print_instance( const byte* frame; case BUF_BLOCK_FILE_PAGE: frame = buf_block_get_frame((buf_block_t*) bpage); - fprintf(stderr, "\ntype " ULINTPF - " index id " IB_ID_FMT "\n", + fprintf(stderr, "\ntype %u index id " IB_ID_FMT "\n", fil_page_get_type(frame), btr_page_get_index_id(frame)); break; case BUF_BLOCK_ZIP_PAGE: frame = bpage->zip.data; - fprintf(stderr, "\ntype " ULINTPF " size " ULINTPF + fprintf(stderr, "\ntype %u size " ULINTPF " index id " IB_ID_FMT "\n", fil_page_get_type(frame), bpage->size.physical(), diff --git a/storage/innobase/include/fil0fil.h b/storage/innobase/include/fil0fil.h index 3b53fa28be3..d3336c5f5b5 100644 --- a/storage/innobase/include/fil0fil.h +++ b/storage/innobase/include/fil0fil.h @@ -1321,9 +1321,8 @@ fil_page_reset_type( @param[in] page file page @return page type */ inline -ulint -fil_page_get_type( - const byte* page) +uint16_t +fil_page_get_type(const byte* page) { return(mach_read_from_2(page + FIL_PAGE_TYPE)); } diff --git a/storage/innobase/include/page0page.h b/storage/innobase/include/page0page.h index 0aca13ac159..9243bcaa717 100644 --- a/storage/innobase/include/page0page.h +++ b/storage/innobase/include/page0page.h @@ -1,6 +1,6 @@ /***************************************************************************** Copyright (c) 1994, 2016, Oracle and/or its affiliates. All Rights Reserved. -Copyright (c) 2013, 2016, MariaDB Corporation +Copyright (c) 2013, 2017, MariaDB Corporation. 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 @@ -264,7 +264,7 @@ page_set_ssn_id( /*************************************************************//** Reads the given header field. */ UNIV_INLINE -ulint +uint16_t page_header_get_field( /*==================*/ const page_t* page, /*!< in: page */ diff --git a/storage/innobase/include/page0page.ic b/storage/innobase/include/page0page.ic index 2ad5f26dcc1..b464e497de1 100644 --- a/storage/innobase/include/page0page.ic +++ b/storage/innobase/include/page0page.ic @@ -170,7 +170,7 @@ page_set_ssn_id( /*************************************************************//** Reads the given header field. */ UNIV_INLINE -ulint +uint16_t page_header_get_field( /*==================*/ const page_t* page, /*!< in: page */ |