Skip to content

M
MariaDB
Commit 8d472f2b authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Merge 10.4 into 10.5

parents 9a3cbc05 767d6337
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
storage/innobase/rem/rem0rec.cc
View file @ 8d472f2b
...@@ -321,7 +321,7 @@ rec_init_offsets_comp_ordinary( ...@@ -321,7 +321,7 @@ rec_init_offsets_comp_ordinary(
ordinary: ordinary:
lens = --nulls - n_core_null_bytes; 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; break;
case REC_LEAF_INSTANT: case REC_LEAF_INSTANT:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7