From abbf169f52e3ec598c37848e11e0d6351cbfb52c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 19 Oct 2018 09:28:21 +0300 Subject: [PATCH 1/2] Remove unused TIMETPF --- storage/innobase/include/univ.i | 3 --- 1 file changed, 3 deletions(-) diff --git a/storage/innobase/include/univ.i b/storage/innobase/include/univ.i index 1d2e0f37dbe..453f15b8784 100644 --- a/storage/innobase/include/univ.i +++ b/storage/innobase/include/univ.i @@ -453,7 +453,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. */ @@ -461,14 +460,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 From ab1ce2204e959bea596817494e932754ab5cbe88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 19 Oct 2018 09:29:28 +0300 Subject: [PATCH 2/2] MDEV-17466: Remove the debug assertion This reverts commit 2d4075e1d9dba3dd8503d65fdb145a6dcc056c51 where the debug assertion was added. There seems to be a potential problem in the purge of indexes that depend on virtual columns. Ultimately, we should change the InnoDB undo log format so that all actual secondary index keys are stored there, also for virtual or spatial indexes. In that way, purge and rollback would be more straightforward. --- storage/innobase/row/row0row.cc | 2 -- 1 file changed, 2 deletions(-) diff --git a/storage/innobase/row/row0row.cc b/storage/innobase/row/row0row.cc index 3f4308d4bed..ad4991fb4e9 100644 --- a/storage/innobase/row/row0row.cc +++ b/storage/innobase/row/row0row.cc @@ -127,8 +127,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