Skip to content

M
MariaDB
Commit 1e0f2eb6 authored by Marko Mäkelä's avatar Marko Mäkelä
Browse files
Options

Fix complation error

parent 5400ff3a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
storage/innobase/rem/rem0rec.cc
View file @ 1e0f2eb6
...@@ -340,8 +340,8 @@ rec_init_offsets_comp_ordinary( ...@@ -340,8 +340,8 @@ rec_init_offsets_comp_ordinary(
ordinary: ordinary:
lens = --nulls - index->n_core_null_bytes; lens = --nulls - index->n_core_null_bytes;
ut_d(n_null = std::min(index->n_core_null_bytes * 8U, ut_d(n_null = std::min<uint>(index->n_core_null_bytes * 8U,
index->n_nullable)); index->n_nullable));
break; break;
case REC_LEAF_INSTANT: case REC_LEAF_INSTANT:
nulls -= REC_N_NEW_EXTRA_BYTES; nulls -= REC_N_NEW_EXTRA_BYTES;
...@@ -1593,8 +1593,8 @@ rec_convert_dtuple_to_rec_comp( ...@@ -1593,8 +1593,8 @@ rec_convert_dtuple_to_rec_comp(
rec_set_status(rec, status); rec_set_status(rec, status);
ut_ad(n_fields ut_ad(n_fields
== dict_index_get_n_unique_in_tree_nonleaf(index) + 1); == dict_index_get_n_unique_in_tree_nonleaf(index) + 1);
ut_d(n_null = std::min(index->n_core_null_bytes * 8U, ut_d(n_null = std::min<uint>(index->n_core_null_bytes * 8U,
index->n_nullable)); index->n_nullable));
n_node_ptr_field = n_fields - 1; n_node_ptr_field = n_fields - 1;
lens = nulls - index->n_core_null_bytes; lens = nulls - index->n_core_null_bytes;
break; break;
......
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