diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-06 12:28:39 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-06 12:28:39 +0300 |
| commit | 4318391346dfd3ebc43175aa24e880b0e74159d4 (patch) | |
| tree | 9b79b4c2e51b2757a1c3238262ea383c447046ff | |
| parent | 027a9963b052fd086a839f2e190a6988de1e17a9 (diff) | |
| parent | c0470caf5a80e69ad7d855a871c62cf72dc03b05 (diff) | |
| download | mariadb-git-4318391346dfd3ebc43175aa24e880b0e74159d4.tar.gz | |
Merge 10.5 into 10.6
| -rw-r--r-- | storage/innobase/page/page0cur.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/storage/innobase/page/page0cur.cc b/storage/innobase/page/page0cur.cc index 3f863d36a3a..3b566e1d6f9 100644 --- a/storage/innobase/page/page0cur.cc +++ b/storage/innobase/page/page0cur.cc @@ -1648,7 +1648,9 @@ inc_dir: { const byte *r= rec; const byte *c= cur->rec; - const byte *c_end= c + (page_rec_is_infimum(c) ? 8 : data_size); + const byte *c_end= c + data_size; + if (page_rec_is_infimum(c) && data_size > 8) + c_end= c + 8; static_assert(REC_N_OLD_EXTRA_BYTES == REC_N_NEW_EXTRA_BYTES + 1, ""); if (c <= insert_buf && c_end > insert_buf) c_end= insert_buf; |