diff options
Diffstat (limited to 'storage/innobase/fts/fts0que.cc')
| -rw-r--r-- | storage/innobase/fts/fts0que.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/storage/innobase/fts/fts0que.cc b/storage/innobase/fts/fts0que.cc index 8f212ff6676..8e2cb838e5a 100644 --- a/storage/innobase/fts/fts0que.cc +++ b/storage/innobase/fts/fts0que.cc @@ -601,14 +601,15 @@ fts_ranking_words_add( ranking->words = static_cast<byte*>( mem_heap_zalloc(query->heap, words_len)); - ut_memcpy(ranking->words, words, ranking->words_len); + memcpy(ranking->words, words, ranking->words_len); ranking->words_len = words_len; } /* Set ranking words */ ut_ad(byte_offset < ranking->words_len); bit_offset = pos % CHAR_BIT; - ranking->words[byte_offset] |= 1 << bit_offset; + ranking->words[byte_offset] = static_cast<byte>( + ranking->words[byte_offset] | 1 << bit_offset); } /*******************************************************************//** @@ -3509,8 +3510,9 @@ fts_query_calculate_idf( word_freq->idf = log10(1.0001); } else { word_freq->idf = log10( - total_docs - / (double) word_freq->doc_count); + static_cast<double>(total_docs) + / static_cast<double>( + word_freq->doc_count)); } } } |