diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-02 21:41:40 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-07-02 21:41:40 +0300 |
commit | 1d45b3b055511d58c1e820ad497793f30871586e (patch) | |
tree | 58e41c04ab412635f48d20aba81c9a4a402975ae | |
parent | e82fe21e3ac3141c92b7c4fb2d1fc3c083d834e8 (diff) | |
parent | c1cb5c17beee1258c6390e132b817012a4572559 (diff) | |
download | mariadb-git-1d45b3b055511d58c1e820ad497793f30871586e.tar.gz |
Merge 10.2 into 10.3
-rw-r--r-- | mysql-test/suite/innodb/t/page_id_innochecksum.test | 1 | ||||
-rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/suite/innodb/t/page_id_innochecksum.test b/mysql-test/suite/innodb/t/page_id_innochecksum.test index 5bd8a58fcd5..a7e61cdbe5f 100644 --- a/mysql-test/suite/innodb/t/page_id_innochecksum.test +++ b/mysql-test/suite/innodb/t/page_id_innochecksum.test @@ -1,4 +1,5 @@ --source include/have_innodb.inc +--source include/not_embedded.inc --echo # Set the environmental variables let MYSQLD_BASEDIR= `SELECT @@basedir`; let MYSQLD_DATADIR= `SELECT @@datadir`; diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index a2217ae8725..c950cc9f138 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -9531,9 +9531,9 @@ ha_innobase::change_active_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++) { + for (uint i = 0; i < table->s->fields; i++) { 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.str, FTS_DOC_ID_COL_NAME)) { m_prebuilt->fts_doc_id_in_read_set = true; |