summaryrefslogtreecommitdiff
path: root/storage/innobase/include/row0ftsort.h
diff options
context:
space:
mode:
authorOleksandr Byelkin <sanja@mariadb.com>2020-05-04 16:47:11 +0200
committerOleksandr Byelkin <sanja@mariadb.com>2020-05-04 16:47:11 +0200
commit7fb73ed1432f53d1d8ab6c7aeb299ac913727ce8 (patch)
treea4931bf9418b28824d3ff4c68f4a2d888b584f65 /storage/innobase/include/row0ftsort.h
parent42bba9782b36247c6c2241ea4d5996723af273fd (diff)
parent5008fc709bca54bd29a4d3f35aebf6e25468b9dd (diff)
downloadmariadb-git-7fb73ed1432f53d1d8ab6c7aeb299ac913727ce8.tar.gz
Merge branch '10.2' into 10.3
Diffstat (limited to 'storage/innobase/include/row0ftsort.h')
-rw-r--r--storage/innobase/include/row0ftsort.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/include/row0ftsort.h b/storage/innobase/include/row0ftsort.h
index 9e5360625f4..3a65e1c58da 100644
--- a/storage/innobase/include/row0ftsort.h
+++ b/storage/innobase/include/row0ftsort.h
@@ -251,7 +251,7 @@ row_merge_fts_sel_propagate(
int* sel_tree, /*<! in: 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: FTS index */
/********************************************************************//**
Read sorted file containing index data tuples and insert these data