Merge 10.5 into 10.6

49844499 · Marko Mäkelä · 64f89b1f · 4c2b6be3 · 49844499
Commit 49844499 authored Mar 12, 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 = mblob ? i + 1 : i;
+			longest_i = uint16_t(i + mblob);
 			longest = savings;

 skip_field: