Skip to content

Commit 3079bd4

Browse files
author
Jan Lindström
committed
Fix release build compile failure.
1 parent 4d3f680 commit 3079bd4

File tree

4 files changed

+18
-28
lines changed

4 files changed

+18
-28
lines changed

‎storage/innobase/btr/btr0btr.cc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ btr_root_block_get(
734734
zip_size = dict_table_zip_size(index->table);
735735
root_page_no = dict_index_get_page(index);
736736

737-
block = btr_block_get(space, zip_size, root_page_no, mode, index, mtr);
737+
block = btr_block_get(space, zip_size, root_page_no, mode, (dict_index_t*)index, mtr);
738738

739739
if (!block) {
740740
index->table->is_encrypted = TRUE;
@@ -876,7 +876,7 @@ btr_root_adjust_on_import(
876876
return(DB_CORRUPTION););
877877

878878
block = btr_block_get(
879-
space_id, zip_size, root_page_no, RW_X_LATCH, index, &mtr);
879+
space_id, zip_size, root_page_no, RW_X_LATCH, (dict_index_t*)index, &mtr);
880880

881881
page = buf_block_get_frame(block);
882882
page_zip = buf_block_get_page_zip(block);
@@ -3500,9 +3500,7 @@ btr_level_list_remove_func(
35003500
ulint zip_size,/*!< in: compressed page size in bytes
35013501
or 0 for uncompressed pages */
35023502
page_t* page, /*!< in/out: page to remove */
3503-
#ifdef UNIV_SYNC_DEBUG
3504-
const dict_index_t* index, /*!< in: index tree */
3505-
#endif /* UNIV_SYNC_DEBUG */
3503+
dict_index_t* index, /*!< in: index tree */
35063504
mtr_t* mtr) /*!< in/out: mini-transaction */
35073505
{
35083506
ulint prev_page_no;

‎storage/innobase/include/btr0btr.h

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ btr_block_get_func(
273273
@return the block descriptor */
274274
# define btr_block_get(space,zip_size,page_no,mode,index,mtr) \
275275
btr_block_get_func(space,zip_size,page_no,mode, \
276-
__FILE__,__LINE__,(dict_index_t*)index,mtr)
276+
__FILE__,__LINE__,index,mtr)
277277
# else /* UNIV_SYNC_DEBUG */
278278
/** Gets a buffer page and declares its latching order level.
279279
@param space tablespace identifier
@@ -285,7 +285,7 @@ btr_block_get_func(
285285
@return the block descriptor */
286286
# define btr_block_get(space,zip_size,page_no,mode,idx,mtr) \
287287
btr_block_get_func(space,zip_size,page_no,mode, \
288-
__FILE__,__LINE__,(dict_index_t*)idx,mtr)
288+
__FILE__,__LINE__,idx,mtr)
289289
# endif /* UNIV_SYNC_DEBUG */
290290
/** Gets a buffer page and declares its latching order level.
291291
@param space tablespace identifier
@@ -297,7 +297,7 @@ btr_block_get_func(
297297
@return the uncompressed page frame */
298298
# define btr_page_get(space,zip_size,page_no,mode,idx,mtr) \
299299
buf_block_get_frame(btr_block_get(space,zip_size,page_no, \
300-
mode,(dict_index_t*)idx,mtr))
300+
mode,idx,mtr))
301301
#endif /* !UNIV_HOTBACKUP */
302302
/**************************************************************//**
303303
Gets the index id field of a page.
@@ -825,7 +825,7 @@ Removes a page from the level list of pages.
825825
@param index in: index tree
826826
@param mtr in/out: mini-transaction */
827827
# define btr_level_list_remove(space,zip_size,page,index,mtr) \
828-
btr_level_list_remove_func(space,zip_size,page,mtr)
828+
btr_level_list_remove_func(space,zip_size,page,index,mtr)
829829
#endif /* UNIV_SYNC_DEBUG */
830830

831831
/*************************************************************//**
@@ -838,11 +838,8 @@ btr_level_list_remove_func(
838838
ulint zip_size,/*!< in: compressed page size in bytes
839839
or 0 for uncompressed pages */
840840
page_t* page, /*!< in/out: page to remove */
841-
#ifdef UNIV_SYNC_DEBUG
842-
const dict_index_t* index, /*!< in: index tree */
843-
#endif /* UNIV_SYNC_DEBUG */
844-
mtr_t* mtr) /*!< in/out: mini-transaction */
845-
__attribute__((nonnull));
841+
dict_index_t* index, /*!< in: index tree */
842+
mtr_t* mtr); /*!< in/out: mini-transaction */
846843

847844
/*************************************************************//**
848845
If page is the only on its level, this function moves its records to the

‎storage/xtradb/btr/btr0btr.cc

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -740,7 +740,7 @@ btr_root_block_get(
740740
zip_size = dict_table_zip_size(index->table);
741741
root_page_no = dict_index_get_page(index);
742742

743-
block = btr_block_get(space, zip_size, root_page_no, mode, index, mtr);
743+
block = btr_block_get(space, zip_size, root_page_no, mode, (dict_index_t*)index, mtr);
744744

745745
if (!block) {
746746
index->table->is_encrypted = TRUE;
@@ -896,7 +896,7 @@ btr_root_adjust_on_import(
896896
return(DB_CORRUPTION););
897897

898898
block = btr_block_get(
899-
space_id, zip_size, root_page_no, RW_X_LATCH, index, &mtr);
899+
space_id, zip_size, root_page_no, RW_X_LATCH, (dict_index_t*)index, &mtr);
900900

901901
page = buf_block_get_frame(block);
902902
page_zip = buf_block_get_page_zip(block);
@@ -3536,9 +3536,7 @@ btr_level_list_remove_func(
35363536
ulint zip_size,/*!< in: compressed page size in bytes
35373537
or 0 for uncompressed pages */
35383538
page_t* page, /*!< in/out: page to remove */
3539-
#ifdef UNIV_SYNC_DEBUG
3540-
const dict_index_t* index, /*!< in: index tree */
3541-
#endif /* UNIV_SYNC_DEBUG */
3539+
dict_index_t* index, /*!< in: index tree */
35423540
mtr_t* mtr) /*!< in/out: mini-transaction */
35433541
{
35443542
ulint prev_page_no;

‎storage/xtradb/include/btr0btr.h

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ btr_block_get_func(
276276
@return the block descriptor */
277277
# define btr_block_get(space,zip_size,page_no,mode,index,mtr) \
278278
btr_block_get_func(space,zip_size,page_no,mode, \
279-
__FILE__,__LINE__,(dict_index_t*)index,mtr)
279+
__FILE__,__LINE__,index,mtr)
280280
# else /* UNIV_SYNC_DEBUG */
281281
/** Gets a buffer page and declares its latching order level.
282282
@param space tablespace identifier
@@ -288,7 +288,7 @@ btr_block_get_func(
288288
@return the block descriptor */
289289
# define btr_block_get(space,zip_size,page_no,mode,idx,mtr) \
290290
btr_block_get_func(space,zip_size,page_no,mode, \
291-
__FILE__,__LINE__,(dict_index_t*)idx,mtr)
291+
__FILE__,__LINE__,idx,mtr)
292292
# endif /* UNIV_SYNC_DEBUG */
293293
/** Gets a buffer page and declares its latching order level.
294294
@param space tablespace identifier
@@ -300,7 +300,7 @@ btr_block_get_func(
300300
@return the uncompressed page frame */
301301
# define btr_page_get(space,zip_size,page_no,mode,idx,mtr) \
302302
buf_block_get_frame(btr_block_get(space,zip_size,page_no, \
303-
mode,(dict_index_t*)idx,mtr))
303+
mode,idx,mtr))
304304
#endif /* !UNIV_HOTBACKUP */
305305
/**************************************************************//**
306306
Gets the index id field of a page.
@@ -828,7 +828,7 @@ Removes a page from the level list of pages.
828828
@param index in: index tree
829829
@param mtr in/out: mini-transaction */
830830
# define btr_level_list_remove(space,zip_size,page,index,mtr) \
831-
btr_level_list_remove_func(space,zip_size,page,mtr)
831+
btr_level_list_remove_func(space,zip_size,page,index,mtr)
832832
#endif /* UNIV_SYNC_DEBUG */
833833

834834
/*************************************************************//**
@@ -841,11 +841,8 @@ btr_level_list_remove_func(
841841
ulint zip_size,/*!< in: compressed page size in bytes
842842
or 0 for uncompressed pages */
843843
page_t* page, /*!< in/out: page to remove */
844-
#ifdef UNIV_SYNC_DEBUG
845-
const dict_index_t* index, /*!< in: index tree */
846-
#endif /* UNIV_SYNC_DEBUG */
847-
mtr_t* mtr) /*!< in/out: mini-transaction */
848-
__attribute__((nonnull));
844+
dict_index_t* index, /*!< in: index tree */
845+
mtr_t* mtr); /*!< in/out: mini-transaction */
849846

850847
/*************************************************************//**
851848
If page is the only on its level, this function moves its records to the

0 commit comments

Comments
 (0)