1 files changed, 13 insertions, 27 deletions

diff --git a/storage/innobase/include/page0cur.ic b/storage/innobase/include/page0cur.ic
index 828be6840d2..5ee96dd716d 100644
--- a/storage/innobase/include/page0cur.ic
+++ b/storage/innobase/include/page0cur.ic
@@ -34,13 +34,7 @@ page_cur_get_page(
 /*==============*/
 	page_cur_t*	cur)	/*!< in: page cursor */
 {
-	ut_ad(cur);
-
-	if (cur->rec) {
-		ut_ad(page_align(cur->rec) == cur->block->frame);
-	}
-
-	return(page_align(cur->rec));
+  return page_align(page_cur_get_rec(cur));
 }
 
 /*********************************************************//**
@@ -52,13 +46,9 @@ page_cur_get_block(
 /*===============*/
 	page_cur_t*	cur)	/*!< in: page cursor */
 {
-	ut_ad(cur);
-
-	if (cur->rec) {
-		ut_ad(page_align(cur->rec) == cur->block->frame);
-	}
-
-	return(cur->block);
+  ut_ad(cur);
+  ut_ad(!cur->rec || page_align(cur->rec) == cur->block->page.frame);
+  return cur->block;
 }
 
 /*********************************************************//**
@@ -82,13 +72,9 @@ page_cur_get_rec(
 /*=============*/
 	page_cur_t*	cur)	/*!< in: page cursor */
 {
-	ut_ad(cur);
-
-	if (cur->rec) {
-		ut_ad(page_align(cur->rec) == cur->block->frame);
-	}
-
-	return(cur->rec);
+  ut_ad(cur);
+  ut_ad(!cur->rec || page_align(cur->rec) == cur->block->page.frame);
+  return cur->rec;
 }
 #endif /* UNIV_DEBUG */
 
@@ -102,7 +88,7 @@ page_cur_set_before_first(
 	const buf_block_t*	block,	/*!< in: index page */
 	page_cur_t*		cur)	/*!< in: cursor */
 {
-	cur->block = (buf_block_t*) block;
+	cur->block = const_cast<buf_block_t*>(block);
 	cur->rec = page_get_infimum_rec(buf_block_get_frame(cur->block));
 }
 
@@ -116,7 +102,7 @@ page_cur_set_after_last(
 	const buf_block_t*	block,	/*!< in: index page */
 	page_cur_t*		cur)	/*!< in: cursor */
 {
-	cur->block = (buf_block_t*) block;
+	cur->block = const_cast<buf_block_t*>(block);
 	cur->rec = page_get_supremum_rec(buf_block_get_frame(cur->block));
 }
 
@@ -130,7 +116,7 @@ page_cur_is_before_first(
 	const page_cur_t*	cur)	/*!< in: cursor */
 {
 	ut_ad(cur);
-	ut_ad(page_align(cur->rec) == cur->block->frame);
+	ut_ad(page_align(cur->rec) == cur->block->page.frame);
 	return(page_rec_is_infimum(cur->rec));
 }
 
@@ -144,7 +130,7 @@ page_cur_is_after_last(
 	const page_cur_t*	cur)	/*!< in: cursor */
 {
 	ut_ad(cur);
-	ut_ad(page_align(cur->rec) == cur->block->frame);
+	ut_ad(page_align(cur->rec) == cur->block->page.frame);
 	return(page_rec_is_supremum(cur->rec));
 }
 
@@ -160,7 +146,7 @@ page_cur_position(
 	page_cur_t*		cur)	/*!< out: page cursor */
 {
 	ut_ad(rec && block && cur);
-	ut_ad(page_align(rec) == block->frame);
+	ut_ad(page_align(rec) == block->page.frame);
 
 	cur->rec = (rec_t*) rec;
 	cur->block = (buf_block_t*) block;
@@ -273,7 +259,7 @@ page_cur_tuple_insert(
 					index, tuple, n_ext);
 
 	*offsets = rec_get_offsets(rec, index, *offsets,
-				   page_is_leaf(cursor->block->frame)
+				   page_is_leaf(cursor->block->page.frame)
 				   ? index->n_core_fields : 0,
 				   ULINT_UNDEFINED, heap);
 	ut_ad(size == rec_offs_size(*offsets));