Return uint16_t instead of ulint

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(),

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));
 }

storage/innobase/include/page0page.h

 /*****************************************************************************
 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 */

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 */