Commit c1cb5c17 authored by Marko Mäkelä's avatar Marko Mäkelä

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

parent 0c6514ee
...@@ -9687,13 +9687,12 @@ ha_innobase::change_active_index( ...@@ -9687,13 +9687,12 @@ ha_innobase::change_active_index(
/* Initialization of search_tuple is not needed for FT index /* Initialization of search_tuple is not needed for FT index
since FT search returns rank only. In addition engine should since FT search returns rank only. In addition engine should
be able to retrieve FTS_DOC_ID column value if necessary. */ be able to retrieve FTS_DOC_ID column value if necessary. */
if ((m_prebuilt->index->type & DICT_FTS)) { if (m_prebuilt->index->type & DICT_FTS) {
for (uint i = 0; i < table->s->fields; i++) {
for (ulint i = 0; i < table->s->fields; i++) {
if (m_prebuilt->read_just_key if (m_prebuilt->read_just_key
&& bitmap_get_next_set(table->read_set, i) && bitmap_is_set(table->read_set, i)
&& !strcmp(table->s->field[i]->field_name, && !strcmp(table->s->field[i]->field_name.str,
FTS_DOC_ID_COL_NAME)){ FTS_DOC_ID_COL_NAME)) {
m_prebuilt->fts_doc_id_in_read_set = true; m_prebuilt->fts_doc_id_in_read_set = true;
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment