Merge 10.2 into 10.3

Author: dr-m

storage/innobase/include/univ.i

@@ -420,22 +420,19 @@ typedef ssize_t lint;
 # define INT64PF	"%lld"
 # define UINT64scan     "llu"
 # define UINT64PFx	"%016llx"
-# define TIMETPF	"%ld"
 #elif defined __APPLE__
 /* Apple prefers to call the 64-bit types 'long long'
 in both 32-bit and 64-bit environments. */
 # define UINT32PF	"%" PRIu32
 # define INT64PF	"%lld"
 # define UINT64scan     "llu"
 # define UINT64PFx	"%016llx"
-# define TIMETPF	"%" PRIdFAST32
 #else
 /* Use the integer types and formatting strings defined in the C99 standard. */
 # define UINT32PF	"%" PRIu32
 # define INT64PF	"%" PRId64
 # define UINT64scan	PRIu64
 # define UINT64PFx	"%016" PRIx64
-# define TIMETPF	"%" PRIdFAST32
 #endif
 
 #ifdef UNIV_INNOCHECKSUM

storage/innobase/row/row0row.cc

@@ -255,8 +255,6 @@ row_build_index_entry_low(
 
 			ut_ad(dfield_is_null(dfield2) ||
 			      dfield_get_len(dfield2) == 0 || dfield2->data);
-			ut_ad(dfield2->type.mtype != DATA_MISSING
-			      || !index->is_committed());
 		} else {
 			dfield2 = dtuple_get_nth_field(row, col_no);
 			ut_ad(dfield_get_type(dfield2)->mtype == DATA_MISSING