diff options
Diffstat (limited to 'storage/innobase/rem/rem0rec.cc')
| -rw-r--r-- | storage/innobase/rem/rem0rec.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/storage/innobase/rem/rem0rec.cc b/storage/innobase/rem/rem0rec.cc index 98cf2dda900..d743ef9aa5c 100644 --- a/storage/innobase/rem/rem0rec.cc +++ b/storage/innobase/rem/rem0rec.cc @@ -291,7 +291,9 @@ rec_init_offsets_comp_ordinary( != n_core) ? UT_BITS_IN_BYTES(unsigned(index->get_n_nullable(n_core))) : (redundant_temp - ? UT_BITS_IN_BYTES(index->n_nullable) + ? (index->is_instant() + ? UT_BITS_IN_BYTES(index->get_n_nullable(n_core)) + : UT_BITS_IN_BYTES(index->n_nullable)) : index->n_core_null_bytes); if (mblob) { @@ -448,7 +450,7 @@ start: continue; } - len = offs += len; + len = offs += static_cast<rec_offs>(len); } else { len = offs += field->fixed_len; } |