diff options
author | Eugene Kosov <claprix@yandex.ru> | 2019-11-01 14:21:29 +0300 |
---|---|---|
committer | Eugene Kosov <claprix@yandex.ru> | 2019-11-01 14:21:29 +0300 |
commit | 792c9f9a4977ea428537ca34435d39bd17cec5ff (patch) | |
tree | 79ddc5c15840903ea694af1808c0dcd53c5c663b /storage/innobase/include/dict0dict.h | |
parent | 1552b254a0140e91c54394af5d06d25ae88d5a28 (diff) | |
download | mariadb-git-792c9f9a4977ea428537ca34435d39bd17cec5ff.tar.gz |
cleanup: get rid of dict_index_add_to_cache_w_vcol()
dict_index_add_to_cache_w_vcol(): merge with dict_index_add_to_cache()
Diffstat (limited to 'storage/innobase/include/dict0dict.h')
-rw-r--r-- | storage/innobase/include/dict0dict.h | 27 |
1 files changed, 5 insertions, 22 deletions
diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h index cddbb0033e8..52ce261a521 100644 --- a/storage/innobase/include/dict0dict.h +++ b/storage/innobase/include/dict0dict.h @@ -1087,23 +1087,6 @@ dict_make_room_in_cache( #define BIG_ROW_SIZE 1024 -/** Adds an index to the dictionary cache. -@param[in] table table on which the index is -@param[in] index index; NOTE! The index memory - object is freed in this function! -@param[in] page_no root page number of the index -@param[in] strict TRUE=refuse to create the index - if records could be too big to fit in - an B-tree page -@return DB_SUCCESS, DB_TOO_BIG_RECORD, or DB_CORRUPTION */ -dberr_t -dict_index_add_to_cache( - dict_table_t* table, - dict_index_t* index, - ulint page_no, - ibool strict) - MY_ATTRIBUTE((warn_unused_result)); - /** Clears the virtual column's index list before index is being freed. @param[in] index Index being freed */ void @@ -1115,20 +1098,20 @@ added column. @param[in] table table on which the index is @param[in] index index; NOTE! The index memory object is freed in this function! -@param[in] add_v new virtual column that being added along with - an add index call @param[in] page_no root page number of the index @param[in] strict TRUE=refuse to create the index if records could be too big to fit in an B-tree page +@param[in] add_v new virtual column that being added along with + an add index call @return DB_SUCCESS, DB_TOO_BIG_RECORD, or DB_CORRUPTION */ dberr_t -dict_index_add_to_cache_w_vcol( +dict_index_add_to_cache( dict_table_t* table, dict_index_t* index, - const dict_add_v_col_t* add_v, ulint page_no, - ibool strict) + ibool strict, + const dict_add_v_col_t* add_v=NULL) MY_ATTRIBUTE((warn_unused_result)); /********************************************************************//** Gets the number of fields in the internal representation of an index, |