Skip to content
Permalink
Browse files

MDEV-19869: Correct the logic, and avoid type mismatch

  • Loading branch information...
dr-m committed Jul 2, 2019
1 parent 0c6514e commit c1cb5c17beee1258c6390e132b817012a4572559
Showing with 5 additions and 6 deletions.
  1. +5 −6 storage/innobase/handler/ha_innodb.cc
@@ -9687,13 +9687,12 @@ ha_innobase::change_active_index(
/* Initialization of search_tuple is not needed for FT index
since FT search returns rank only. In addition engine should
be able to retrieve FTS_DOC_ID column value if necessary. */
if ((m_prebuilt->index->type & DICT_FTS)) {

for (ulint i = 0; i < table->s->fields; i++) {
if (m_prebuilt->index->type & DICT_FTS) {
for (uint i = 0; i < table->s->fields; i++) {
if (m_prebuilt->read_just_key
&& bitmap_get_next_set(table->read_set, i)
&& !strcmp(table->s->field[i]->field_name,
FTS_DOC_ID_COL_NAME)){
&& bitmap_is_set(table->read_set, i)
&& !strcmp(table->s->field[i]->field_name.str,
FTS_DOC_ID_COL_NAME)) {
m_prebuilt->fts_doc_id_in_read_set = true;
break;
}

0 comments on commit c1cb5c1

Please sign in to comment.
You can’t perform that action at this time.