summaryrefslogtreecommitdiff
path: root/storage/innobase/row
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2018-10-19 10:15:53 +0300
committerMarko Mäkelä <marko.makela@mariadb.com>2018-10-19 10:15:53 +0300
commit1bb9041176ecf9a63381553047b80e66583a527e (patch)
tree37a6c63ef8e901bcffd23fd7df3dffa23b88761a /storage/innobase/row
parent9b14e3771753c22480f2aa9c4b4f1df1e4776e6f (diff)
parent1595ff8a2ce7ef0153203041a850b4ec8d144b8d (diff)
downloadmariadb-git-1bb9041176ecf9a63381553047b80e66583a527e.tar.gz
Merge 10.3 into 10.4
Diffstat (limited to 'storage/innobase/row')
-rw-r--r--storage/innobase/row/row0row.cc2
1 files changed, 0 insertions, 2 deletions
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