summaryrefslogtreecommitdiff
path: root/storage/innobase/fts/fts0que.cc
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase/fts/fts0que.cc')
-rw-r--r--storage/innobase/fts/fts0que.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/storage/innobase/fts/fts0que.cc b/storage/innobase/fts/fts0que.cc
index bc1d173cc29..594f337c978 100644
--- a/storage/innobase/fts/fts0que.cc
+++ b/storage/innobase/fts/fts0que.cc
@@ -2430,7 +2430,8 @@ fts_query_terms_in_document(
/*****************************************************************//**
Retrieve the document and match the phrase tokens.
@return DB_SUCCESS or error code */
-static MY_ATTRIBUTE((nonnull, warn_unused_result))
+MY_ATTRIBUTE((nonnull(1,2,3,6), warn_unused_result))
+static
dberr_t
fts_query_match_document(
/*=====================*/
@@ -2692,7 +2693,6 @@ fts_query_phrase_split(
if (fts_check_token(
&result_str,
cache->stopword_info.cached_stopword,
- query->index->is_ngram,
query->fts_index_table.charset)) {
/* Add the word to the RB tree so that we can
calculate it's frequencey within a document. */
@@ -4277,7 +4277,6 @@ fts_expand_query(
result_doc.charset = index_cache->charset;
result_doc.parser = index_cache->index->parser;
- result_doc.is_ngram = index_cache->index->is_ngram;
query->total_size += SIZEOF_RBT_CREATE;