Merge 10.2 into 10.3

mysql-test/suite/innodb/t/import_corrupted.test

@@ -65,3 +65,4 @@ ALTER TABLE t2 IMPORT TABLESPACE;
 DROP TABLE t2;
 
 --remove_file $MYSQLD_DATADIR/test/tmp.ibd
+--remove_file $MYSQLD_DATADIR/test/tmp.cfg

sql/sql_lex.cc

@@ -2913,7 +2913,7 @@ bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num)
     prepared statement
   */
   Query_arena *arena= thd->stmt_arena;
-  const uint n_elems= (n_sum_items +
+  const size_t n_elems= (n_sum_items +
                        n_child_sum_items +
                        item_list.elements +
                        select_n_reserved +
@@ -2921,7 +2921,8 @@ bool st_select_lex::setup_ref_array(THD *thd, uint order_group_num)
                        select_n_where_fields +
                        order_group_num +
                        hidden_bit_fields +
-                       fields_in_window_functions) * 5;
+                       fields_in_window_functions) * (size_t) 5;
+  DBUG_ASSERT(n_elems % 5 == 0);
   if (!ref_pointer_array.is_null())
   {
     /*

storage/innobase/row/row0import.cc

@@ -689,9 +689,7 @@ dberr_t FetchIndexRootPages::operator()(buf_block_t* block) UNIV_NOTHROW
 
 	const page_t*	page = get_frame(block);
 
-	index_id_t	id = btr_page_get_index_id(page);
-
-	m_index.m_id = id;
+	m_index.m_id = btr_page_get_index_id(page);
 	m_index.m_page_no = block->page.id.page_no();
 
 	/* Check that the tablespace flags match the table flags. */
@@ -1886,11 +1884,14 @@ PageConverter::update_index_page(
 
 	if (is_free(block->page.id.page_no())) {
 		return(DB_SUCCESS);
-	} else if ((id = btr_page_get_index_id(page)) != m_index->m_id && !m_cfg->m_missing) {
-
+	} else if ((id = btr_page_get_index_id(page)) != m_index->m_id) {
 		row_index_t*	index = find_index(id);
 
 		if (UNIV_UNLIKELY(!index)) {
+			if (m_cfg->m_missing) {
+				return DB_SUCCESS;
+			}
+
 			ib::error() << "Page for tablespace " << m_space
 				<< " is index page with id " << id
 				<< " but that index is not found from"