Merge 10.5 into 10.6

dr-m · dr-m · commit 49844499562d · 2021-03-12T08:36:26.000+02:00
diff --git 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:
