diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-03 14:20:27 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-12-03 15:28:53 +0200 |
commit | 9702be2c73c493b28a5607c7755a8447a42536f8 (patch) | |
tree | 812bba37b480432990ac1d3b8a2f047147436021 /storage/innobase/include/btr0cur.h | |
parent | ac028ec5d853a4f797e5c48c348959618c773d62 (diff) | |
download | mariadb-git-9702be2c73c493b28a5607c7755a8447a42536f8.tar.gz |
MDEV-24142: Remove __FILE__,__LINE__ related to buf_block_t::lock
Diffstat (limited to 'storage/innobase/include/btr0cur.h')
-rw-r--r-- | storage/innobase/include/btr0cur.h | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/storage/innobase/include/btr0cur.h b/storage/innobase/include/btr0cur.h index 46a5bf397d2..f64c2771204 100644 --- a/storage/innobase/include/btr0cur.h +++ b/storage/innobase/include/btr0cur.h @@ -158,8 +158,6 @@ btr_cur_instant_root_init(dict_index_t* index, const page_t* page) @param[in] modify_clock modify clock value @param[in,out] latch_mode BTR_SEARCH_LEAF, ... @param[in,out] cursor cursor -@param[in] file file name -@param[in] line line where called @param[in] mtr mini-transaction @return true if success */ bool @@ -168,8 +166,6 @@ btr_cur_optimistic_latch_leaves( ib_uint64_t modify_clock, ulint* latch_mode, btr_cur_t* cursor, - const char* file, - unsigned line, mtr_t* mtr); /********************************************************************//** @@ -208,26 +204,23 @@ btr_cur_search_to_nth_level_func( srw_lock* ahi_latch, /*!< in: currently held AHI rdlock, or NULL */ #endif /* BTR_CUR_HASH_ADAPT */ - const char* file, /*!< in: file name */ - unsigned line, /*!< in: line where called */ mtr_t* mtr, /*!< in/out: mini-transaction */ ib_uint64_t autoinc = 0); /*!< in: PAGE_ROOT_AUTO_INC to be written (0 if none) */ #ifdef BTR_CUR_HASH_ADAPT -# define btr_cur_search_to_nth_level(i,l,t,m,lm,c,a,fi,li,mtr) \ - btr_cur_search_to_nth_level_func(i,l,t,m,lm,c,a,fi,li,mtr) +# define btr_cur_search_to_nth_level(i,l,t,m,lm,c,a,mtr) \ + btr_cur_search_to_nth_level_func(i,l,t,m,lm,c,a,mtr) #else /* BTR_CUR_HASH_ADAPT */ -# define btr_cur_search_to_nth_level(i,l,t,m,lm,c,a,fi,li,mtr) \ - btr_cur_search_to_nth_level_func(i,l,t,m,lm,c,fi,li,mtr) +# define btr_cur_search_to_nth_level(i,l,t,m,lm,c,a,mtr) \ + btr_cur_search_to_nth_level_func(i,l,t,m,lm,c,mtr) #endif /* BTR_CUR_HASH_ADAPT */ /*****************************************************************//** Opens a cursor at either end of an index. @return DB_SUCCESS or error code */ dberr_t -btr_cur_open_at_index_side_func( -/*============================*/ +btr_cur_open_at_index_side( bool from_left, /*!< in: true if open to the low end, false if to the high end */ dict_index_t* index, /*!< in: index */ @@ -235,29 +228,19 @@ btr_cur_open_at_index_side_func( btr_cur_t* cursor, /*!< in/out: cursor */ ulint level, /*!< in: level to search for (0=leaf) */ - const char* file, /*!< in: file name */ - unsigned line, /*!< in: line where called */ mtr_t* mtr) /*!< in/out: mini-transaction */ MY_ATTRIBUTE((nonnull)); -#define btr_cur_open_at_index_side(f,i,l,c,lv,m) \ - btr_cur_open_at_index_side_func(f,i,l,c,lv,__FILE__,__LINE__,m) - /**********************************************************************//** Positions a cursor at a randomly chosen position within a B-tree. @return true if the index is available and we have put the cursor, false if the index is unavailable */ bool -btr_cur_open_at_rnd_pos_func( -/*=========================*/ +btr_cur_open_at_rnd_pos( dict_index_t* index, /*!< in: index */ ulint latch_mode, /*!< in: BTR_SEARCH_LEAF, ... */ btr_cur_t* cursor, /*!< in/out: B-tree cursor */ - const char* file, /*!< in: file name */ - unsigned line, /*!< in: line where called */ mtr_t* mtr); /*!< in: mtr */ -#define btr_cur_open_at_rnd_pos(i,l,c,m) \ - btr_cur_open_at_rnd_pos_func(i,l,c,__FILE__,__LINE__,m) /*************************************************************//** Tries to perform an insert to a page in an index tree, next to cursor. It is assumed that mtr holds an x-latch on the page. The operation does |