diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-02-12 08:55:17 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-02-12 08:55:17 +0100 |
| commit | 4b087e175431895bd5a69cb298281f0c30a1d2a6 (patch) | |
| tree | 17a5b0e8f4a678f46ff1e1b1faabcdfedacc5ffe /storage/innobase/include/rem0rec.ic | |
| parent | fc2f2fa85306d80c317e76933264ba3d3675ed1c (diff) | |
| parent | 646d1ec83a57d9a5b380079afc3612c1d9acadd5 (diff) | |
| download | mariadb-git-4b087e175431895bd5a69cb298281f0c30a1d2a6.tar.gz | |
Merge branch '10.4' into 10.5
Diffstat (limited to 'storage/innobase/include/rem0rec.ic')
| -rw-r--r-- | storage/innobase/include/rem0rec.ic | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/storage/innobase/include/rem0rec.ic b/storage/innobase/include/rem0rec.ic index fe82feaecd8..b97cf71fd4b 100644 --- a/storage/innobase/include/rem0rec.ic +++ b/storage/innobase/include/rem0rec.ic @@ -1390,7 +1390,11 @@ rec_get_converted_size( data_size = dtuple_get_data_size(dtuple, 0); - ut_ad(n_ext == dtuple_get_n_ext(dtuple)); + /* If primary key is being updated then the new record inherits + externally stored fields from the delete-marked old record. + In that case, n_ext may be less value than + dtuple_get_n_ext(tuple). */ + ut_ad(n_ext <= dtuple_get_n_ext(dtuple)); extra_size = rec_get_converted_extra_size( data_size, dtuple_get_n_fields(dtuple), n_ext); |