Merge 10.2 into 10.3

Author: dr-m

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`;

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;