diff options
Diffstat (limited to 'storage/xtradb/include/btr0btr.h')
| -rw-r--r-- | storage/xtradb/include/btr0btr.h | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/storage/xtradb/include/btr0btr.h b/storage/xtradb/include/btr0btr.h index d701e82cf83..36aaf676ccf 100644 --- a/storage/xtradb/include/btr0btr.h +++ b/storage/xtradb/include/btr0btr.h @@ -2,7 +2,7 @@ Copyright (c) 1994, 2013, Oracle and/or its affiliates. All Rights Reserved. Copyright (c) 2012, Facebook Inc. -Copyright (c) 2014, SkySQL Ab. All Rights Reserved. +Copyright (c) 2014, 2015, MariaDB Corporation. All Rights Reserved. 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 @@ -262,10 +262,8 @@ btr_block_get_func( ulint mode, /*!< in: latch mode */ const char* file, /*!< in: file name */ ulint line, /*!< in: line where called */ -# ifdef UNIV_SYNC_DEBUG - const dict_index_t* index, /*!< in: index tree, may be NULL + dict_index_t* index, /*!< in: index tree, may be NULL if it is not an insert buffer tree */ -# endif /* UNIV_SYNC_DEBUG */ mtr_t* mtr); /*!< in/out: mini-transaction */ # ifdef UNIV_SYNC_DEBUG /** Gets a buffer page and declares its latching order level. @@ -289,7 +287,8 @@ btr_block_get_func( @param mtr mini-transaction handle @return the block descriptor */ # define btr_block_get(space,zip_size,page_no,mode,idx,mtr) \ - btr_block_get_func(space,zip_size,page_no,mode,__FILE__,__LINE__,mtr) + btr_block_get_func(space,zip_size,page_no,mode, \ + __FILE__,__LINE__,idx,mtr) # endif /* UNIV_SYNC_DEBUG */ /** Gets a buffer page and declares its latching order level. @param space tablespace identifier @@ -300,7 +299,8 @@ btr_block_get_func( @param mtr mini-transaction handle @return the uncompressed page frame */ # define btr_page_get(space,zip_size,page_no,mode,idx,mtr) \ - buf_block_get_frame(btr_block_get(space,zip_size,page_no,mode,idx,mtr)) + buf_block_get_frame(btr_block_get(space,zip_size,page_no, \ + mode,idx,mtr)) #endif /* !UNIV_HOTBACKUP */ /**************************************************************//** Gets the index id field of a page. @@ -800,9 +800,9 @@ btr_index_rec_validate( __attribute__((nonnull, warn_unused_result)); /**************************************************************//** Checks the consistency of an index tree. -@return TRUE if ok */ +@return DB_SUCCESS if ok, error code if not */ UNIV_INTERN -bool +dberr_t btr_validate_index( /*===============*/ dict_index_t* index, /*!< in: index */ @@ -828,7 +828,7 @@ Removes a page from the level list of pages. @param index in: index tree @param mtr in/out: mini-transaction */ # define btr_level_list_remove(space,zip_size,page,index,mtr) \ - btr_level_list_remove_func(space,zip_size,page,mtr) + btr_level_list_remove_func(space,zip_size,page,index,mtr) #endif /* UNIV_SYNC_DEBUG */ /*************************************************************//** @@ -841,11 +841,8 @@ btr_level_list_remove_func( ulint zip_size,/*!< in: compressed page size in bytes or 0 for uncompressed pages */ page_t* page, /*!< in/out: page to remove */ -#ifdef UNIV_SYNC_DEBUG - const dict_index_t* index, /*!< in: index tree */ -#endif /* UNIV_SYNC_DEBUG */ - mtr_t* mtr) /*!< in/out: mini-transaction */ - __attribute__((nonnull)); + dict_index_t* index, /*!< in: index tree */ + mtr_t* mtr); /*!< in/out: mini-transaction */ /*************************************************************//** If page is the only on its level, this function moves its records to the |