diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-12 22:03:31 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-12 22:03:31 +0300 |
| commit | 899c843f11bc40bf4734b61f18bd1d1e5c8d61e5 (patch) | |
| tree | f5c1842619f8408c9d23939104fb787938cd5494 | |
| parent | 0a473de08d661542e73af94c444a17ef697fcf73 (diff) | |
| parent | fa6c6062574f091638f1143ef67eee4fc111fb32 (diff) | |
| download | mariadb-git-899c843f11bc40bf4734b61f18bd1d1e5c8d61e5.tar.gz | |
Merge 10.3 into 10.4
| -rw-r--r-- | storage/innobase/rem/rem0rec.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/innobase/rem/rem0rec.cc b/storage/innobase/rem/rem0rec.cc index 043a71733a5..1f0f661448c 100644 --- a/storage/innobase/rem/rem0rec.cc +++ b/storage/innobase/rem/rem0rec.cc @@ -788,7 +788,9 @@ resolved: } if (i < rec_offs_n_fields(offsets)) { - ut_ad(index->is_instant()); + ut_ad(index->is_instant() + || i + (index->id == DICT_INDEXES_ID) + == rec_offs_n_fields(offsets)); offs = (rec_offs_base(offsets)[i] & REC_OFFS_MASK) | REC_OFFS_DEFAULT; |