diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-19 10:15:53 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-19 10:15:53 +0300 |
| commit | 1bb9041176ecf9a63381553047b80e66583a527e (patch) | |
| tree | 37a6c63ef8e901bcffd23fd7df3dffa23b88761a /storage | |
| parent | 9b14e3771753c22480f2aa9c4b4f1df1e4776e6f (diff) | |
| parent | 1595ff8a2ce7ef0153203041a850b4ec8d144b8d (diff) | |
| download | mariadb-git-1bb9041176ecf9a63381553047b80e66583a527e.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/include/univ.i | 3 | ||||
| -rw-r--r-- | storage/innobase/row/row0row.cc | 2 |
2 files changed, 0 insertions, 5 deletions
diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 4acedc0e0f1..f815463d2e8 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -420,7 +420,6 @@ 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. */ @@ -428,14 +427,12 @@ in both 32-bit and 64-bit environments. */ # 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 diff --git a/storage/innobase/row/row0row.cc b/storage/innobase/row/row0row.cc index e16241449d8..8cd215d8902 100644 --- a/storage/innobase/row/row0row.cc +++ b/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 |