1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 10.3 into 10.4

Browse Source
This commit is contained in:
Marko Mäkelä 2019-10-12 22:03:31 +03:00
commit 899c843f11
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/innobase/rem/rem0rec.cc
View File

@ -788,7 +788,9 @@ resolved:
} }
if (i < rec_offs_n_fields(offsets)) { 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) offs = (rec_offs_base(offsets)[i] & REC_OFFS_MASK)
| REC_OFFS_DEFAULT; | REC_OFFS_DEFAULT;