Merge 10.5 into 10.6

64f89b1f · Marko Mäkelä · a43ff483 · abe25c31 · 64f89b1f
Commit 64f89b1f authored Mar 11, 2021 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

storage/innobase/data/data0data.cc storage/innobase/data/data0data.cc +1 -1

No files found.
--- a/storage/innobase/data/data0data.cc
+++ b/storage/innobase/data/data0data.cc
@@ -688,7 +688,7 @@ dtuple_convert_big_rec(
 				goto skip_field;
 			}
-			longest_i = i + mblob;
+			longest_i = mblob ? i + 1 : i;
 			longest = savings;
 skip_field: