diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-06 13:14:31 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-11-06 13:14:31 +0200 |
| commit | 908ca4668d5cb415f4737c8617ffb84f2c15855d (patch) | |
| tree | 97b0b5322c3833d5d66e6a8b0c6de195aca18320 /storage/innobase/include/dict0dict.h | |
| parent | 5d3bd2b75b5bf32e69a9b32333cbf8dffe7a2541 (diff) | |
| parent | 90451a59811b415a443aab97230e694856392cb5 (diff) | |
| download | mariadb-git-908ca4668d5cb415f4737c8617ffb84f2c15855d.tar.gz | |
Merge 10.2 into 10.3
Diffstat (limited to 'storage/innobase/include/dict0dict.h')
| -rw-r--r-- | storage/innobase/include/dict0dict.h | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/storage/innobase/include/dict0dict.h b/storage/innobase/include/dict0dict.h index 8d12cccec32..a015c176a78 100644 --- a/storage/innobase/include/dict0dict.h +++ b/storage/innobase/include/dict0dict.h @@ -1067,26 +1067,21 @@ void dict_index_remove_from_v_col_list(dict_index_t* index); /** Adds an index to the dictionary cache, with possible indexing newly added column. -@param[in] index index; NOTE! The index memory +@param[in,out] 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 -@param[out] err DB_SUCCESS, DB_TOO_BIG_RECORD, or DB_CORRUPTION -@param[in] add_v new virtual column that being added along with - an add index call -@return the added index -@retval NULL on error */ -dict_index_t* +@param[in] add_v virtual columns being added along with ADD INDEX +@return DB_SUCCESS, DB_TOO_BIG_RECORD, or DB_CORRUPTION */ +dberr_t dict_index_add_to_cache( - dict_index_t* index, + dict_index_t*& index, ulint page_no, bool strict = false, - dberr_t* err = NULL, const dict_add_v_col_t* add_v = NULL) - MY_ATTRIBUTE((nonnull(1))); - + MY_ATTRIBUTE((warn_unused_result)); /********************************************************************//** Gets the number of fields in the internal representation of an index, including fields added by the dictionary system. |