Skip to content

M
MariaDB
Commit 194bc6eb authored by sergefp@mysql.com's avatar sergefp@mysql.com
Browse files
Options

BUG#5401: post-review fixes

parent 5cf716aa
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
innobase/row/row0sel.c
View file @ 194bc6eb
...@@ -2731,7 +2731,6 @@ row_sel_pop_cached_row_for_mysql( ...@@ -2731,7 +2731,6 @@ row_sel_pop_cached_row_for_mysql(
ulint i; ulint i;
mysql_row_templ_t* templ; mysql_row_templ_t* templ;
byte* cached_rec; byte* cached_rec;
byte null_byte;
ut_ad(prebuilt->n_fetch_cached > 0); ut_ad(prebuilt->n_fetch_cached > 0);
if (prebuilt->keep_other_fields_on_keyread) if (prebuilt->keep_other_fields_on_keyread)
...@@ -2747,15 +2746,14 @@ row_sel_pop_cached_row_for_mysql( ...@@ -2747,15 +2746,14 @@ row_sel_pop_cached_row_for_mysql(
buf + templ->mysql_col_offset, buf + templ->mysql_col_offset,
cached_rec + templ->mysql_col_offset, cached_rec + templ->mysql_col_offset,
templ->mysql_col_len); templ->mysql_col_len);
/* Copy NULL bit of the current field from cached_rec /* Copy NULL bit of the current field from cached_rec
to buf */ to buf */
if (templ->mysql_null_bit_mask) if (templ->mysql_null_bit_mask)
{ {
null_byte = buf[templ->mysql_null_byte_offset] & buf[templ->mysql_null_byte_offset] ^=
~(byte)templ->mysql_null_bit_mask; (buf[templ->mysql_null_byte_offset] ^
null_byte |= (byte)templ->mysql_null_bit_mask & cached_rec[templ->mysql_null_byte_offset]) &
cached_rec[templ->mysql_null_byte_offset]; (byte)templ->mysql_null_bit_mask;
buf[templ->mysql_null_byte_offset] = null_byte;
} }
} }
} }
......
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