Merge branch 'mysql-5.7' into mysql-8.0

Author: mayprasa

storage/innobase/row/row0import.cc

@@ -1649,12 +1649,6 @@ dberr_t PageConverter::update_records(buf_block_t *block) UNIV_NOTHROW {
   while (!m_rec_iter.end()) {
     rec_t *rec = m_rec_iter.current();
 
-    /* FIXME: Move out of the loop */
-
-    if (rec_get_status(rec) == REC_STATUS_NODE_PTR) {
-      break;
-    }
-
     ibool deleted = rec_get_deleted_flag(rec, comp);
 
     /* For the clustered index we have to adjust the BLOB
@@ -1746,6 +1740,10 @@ dberr_t PageConverter::update_index_page(buf_block_t *block) UNIV_NOTHROW {
     return (DB_SUCCESS);
   }
 
+  if (!page_is_leaf(block->frame)) {
+    return (DB_SUCCESS);
+  }
+
   return (update_records(block));
 }