Merge 10.4 into 10.5

8d472f2b · Marko Mäkelä · 9a3cbc05 · 767d6337 · 8d472f2b
Commit 8d472f2b authored Apr 14, 2021 by Marko Mäkelä
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

storage/innobase/rem/rem0rec.cc storage/innobase/rem/rem0rec.cc +2 -2

No files found.
--- a/storage/innobase/rem/rem0rec.cc
+++ b/storage/innobase/rem/rem0rec.cc
@@ -321,8 +321,8 @@ rec_init_offsets_comp_ordinary(
 ordinary:
 		lens = --nulls - n_core_null_bytes;
-		ut_d(n_null = std::min(n_core_null_bytes * 8U,
+		ut_d(n_null = std::min<uint>(n_core_null_bytes * 8U,
-				       index->n_nullable));
+					     index->n_nullable));
 		break;
 	case REC_LEAF_INSTANT:
 		nulls -= REC_N_NEW_EXTRA_BYTES;