diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 12:48:48 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-04-14 12:48:48 +0300 |
| commit | 8d472f2b783e4d67e07caa789ddcc8faf2b01650 (patch) | |
| tree | 74701e2eb4454ecfe0a4f17b45dc5f0e512e2c11 | |
| parent | 9a3cbc05415dd862852dffbd368527319107f460 (diff) | |
| parent | 767d63374e634f8ede5e18a8a74127a113013467 (diff) | |
| download | mariadb-git-8d472f2b783e4d67e07caa789ddcc8faf2b01650.tar.gz | |
Merge 10.4 into 10.5
| -rw-r--r-- | storage/innobase/rem/rem0rec.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/innobase/rem/rem0rec.cc b/storage/innobase/rem/rem0rec.cc index 419727b4d37..4a32cb0556c 100644 --- 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, - index->n_nullable)); + ut_d(n_null = std::min<uint>(n_core_null_bytes * 8U, + index->n_nullable)); break; case REC_LEAF_INSTANT: nulls -= REC_N_NEW_EXTRA_BYTES; |