diff options
Diffstat (limited to 'storage/innobase/fts/fts0que.cc')
| -rw-r--r-- | storage/innobase/fts/fts0que.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/storage/innobase/fts/fts0que.cc b/storage/innobase/fts/fts0que.cc index 6baec777270..03b7fa9332b 100644 --- a/storage/innobase/fts/fts0que.cc +++ b/storage/innobase/fts/fts0que.cc @@ -1747,7 +1747,7 @@ fts_query_match_phrase_add_word_for_parser( MYSQL_FTPARSER_PARAM* param, /*!< in: parser param */ const char* word, /*!< in: token */ int word_len, /*!< in: token length */ - MYSQL_FTPARSER_BOOLEAN_INFO* info) /*!< in: token info */ + MYSQL_FTPARSER_BOOLEAN_INFO*) { fts_phrase_param_t* phrase_param; fts_phrase_t* phrase; @@ -1769,8 +1769,8 @@ fts_query_match_phrase_add_word_for_parser( } match.f_str = (uchar *)(word); - match.f_len = word_len; - match.f_n_char = fts_get_token_size(phrase->charset, word, word_len); + match.f_len = ulint(word_len); + match.f_n_char= fts_get_token_size(phrase->charset, word, match.f_len); if (match.f_len > 0) { /* Get next token to match. */ @@ -1902,7 +1902,7 @@ fts_query_match_phrase( &phrase_param, phrase->parser, ptr, - (end - ptr))) { + ulint(end - ptr))) { break; } } else { @@ -3293,7 +3293,7 @@ fts_query_filter_doc_ids( ++ptr; /* Bytes decoded so far */ - decoded = ptr - (byte*) data; + decoded = ulint(ptr - (byte*) data); /* We simply collect the matching documents and the positions here and match later. */ @@ -3917,7 +3917,7 @@ fts_query_can_optimize( } /** FTS Query entry point. -@param[in] trx transaction +@param[in,out] trx transaction @param[in] index fts index to search @param[in] flags FTS search mode @param[in] query_str FTS query @@ -3939,7 +3939,7 @@ fts_query( ulint lc_query_str_len; ulint result_len; bool boolean_mode; - trx_t* query_trx; + trx_t* query_trx; /* FIXME: use provided trx */ CHARSET_INFO* charset; ulint start_time_ms; bool will_be_ignored = false; @@ -3948,7 +3948,7 @@ fts_query( *result = NULL; memset(&query, 0x0, sizeof(query)); - query_trx = trx_allocate_for_background(); + query_trx = trx_create(); query_trx->op_info = "FTS query"; start_time_ms = ut_time_ms(); @@ -4115,7 +4115,7 @@ fts_query( << diff_time / 1000 << " secs: " << diff_time % 1000 << " millisec: row(s) " << ((*result)->rankings_by_id - ? rbt_size((*result)->rankings_by_id) + ? lint(rbt_size((*result)->rankings_by_id)) : -1); /* Log memory consumption & result size */ @@ -4130,7 +4130,7 @@ fts_query( func_exit: fts_query_free(&query); - trx_free_for_background(query_trx); + trx_free(query_trx); return(error); } |