diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-04 16:47:11 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-05-04 16:47:11 +0200 |
| commit | 7fb73ed1432f53d1d8ab6c7aeb299ac913727ce8 (patch) | |
| tree | a4931bf9418b28824d3ff4c68f4a2d888b584f65 /storage/innobase/row/row0ftsort.cc | |
| parent | 42bba9782b36247c6c2241ea4d5996723af273fd (diff) | |
| parent | 5008fc709bca54bd29a4d3f35aebf6e25468b9dd (diff) | |
| download | mariadb-git-7fb73ed1432f53d1d8ab6c7aeb299ac913727ce8.tar.gz | |
Merge branch '10.2' into 10.3
Diffstat (limited to 'storage/innobase/row/row0ftsort.cc')
| -rw-r--r-- | storage/innobase/row/row0ftsort.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc index d439d7563d9..ec65f295e7f 100644 --- a/storage/innobase/row/row0ftsort.cc +++ b/storage/innobase/row/row0ftsort.cc @@ -1372,7 +1372,7 @@ row_fts_sel_tree_propagate( ulint propogated, /*<! in: tree node propagated */ int* sel_tree, /*<! in: selection tree */ const mrec_t** mrec, /*<! in: sort record */ - offset_t** offsets, /*<! in: record offsets */ + rec_offs** offsets, /*<! in: record offsets */ dict_index_t* index) /*<! in/out: FTS index */ { ulint parent; @@ -1422,7 +1422,7 @@ row_fts_sel_tree_update( ulint propagated, /*<! in: node to propagate up */ ulint height, /*<! in: tree height */ const mrec_t** mrec, /*<! in: sort record */ - offset_t** offsets, /*<! in: record offsets */ + rec_offs** offsets, /*<! in: record offsets */ dict_index_t* index) /*<! in: index dictionary */ { ulint i; @@ -1444,7 +1444,7 @@ row_fts_build_sel_tree_level( int* sel_tree, /*<! in/out: selection tree */ ulint level, /*<! in: selection tree level */ const mrec_t** mrec, /*<! in: sort record */ - offset_t** offsets, /*<! in: record offsets */ + rec_offs** offsets, /*<! in: record offsets */ dict_index_t* index) /*<! in: index dictionary */ { ulint start; @@ -1504,7 +1504,7 @@ row_fts_build_sel_tree( /*===================*/ int* sel_tree, /*<! in/out: selection tree */ const mrec_t** mrec, /*<! in: sort record */ - offset_t** offsets, /*<! in: record offsets */ + rec_offs** offsets, /*<! in: record offsets */ dict_index_t* index) /*<! in: index dictionary */ { ulint treelevel = 1; @@ -1554,7 +1554,7 @@ row_fts_merge_insert( mem_heap_t* heap; dberr_t error = DB_SUCCESS; ulint* foffs; - offset_t** offsets; + rec_offs** offsets; fts_tokenizer_word_t new_word; ib_vector_t* positions; doc_id_t last_doc_id; @@ -1593,7 +1593,7 @@ row_fts_merge_insert( heap, sizeof (*b) * fts_sort_pll_degree); foffs = (ulint*) mem_heap_alloc( heap, sizeof(*foffs) * fts_sort_pll_degree); - offsets = (offset_t**) mem_heap_alloc( + offsets = (rec_offs**) mem_heap_alloc( heap, sizeof(*offsets) * fts_sort_pll_degree); buf = (mrec_buf_t**) mem_heap_alloc( heap, sizeof(*buf) * fts_sort_pll_degree); @@ -1617,7 +1617,7 @@ row_fts_merge_insert( num = 1 + REC_OFFS_HEADER_SIZE + dict_index_get_n_fields(index); - offsets[i] = static_cast<offset_t*>(mem_heap_zalloc( + offsets[i] = static_cast<rec_offs*>(mem_heap_zalloc( heap, num * sizeof *offsets[i])); rec_offs_set_n_alloc(offsets[i], num); rec_offs_set_n_fields(offsets[i], dict_index_get_n_fields(index)); |