1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#5401: post-review fixes

Browse Source
This commit is contained in:
sergefp@mysql.com 2005-01-12 08:39:15 +03:00
parent 5cf716aa4e
commit 194bc6eb9c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
innobase/row/row0sel.c
View File

@ -2731,7 +2731,6 @@ row_sel_pop_cached_row_for_mysql(
ulint i;
mysql_row_templ_t* templ;
byte* cached_rec;
byte null_byte;
ut_ad(prebuilt->n_fetch_cached > 0);
if (prebuilt->keep_other_fields_on_keyread)
@ -2747,15 +2746,14 @@ row_sel_pop_cached_row_for_mysql(
buf + templ->mysql_col_offset,
cached_rec + templ->mysql_col_offset,
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 */
if (templ->mysql_null_bit_mask)
{
null_byte = buf[templ->mysql_null_byte_offset] &
~(byte)templ->mysql_null_bit_mask;
null_byte |= (byte)templ->mysql_null_bit_mask &
cached_rec[templ->mysql_null_byte_offset];
buf[templ->mysql_null_byte_offset] = null_byte;
buf[templ->mysql_null_byte_offset] ^=
(buf[templ->mysql_null_byte_offset] ^
cached_rec[templ->mysql_null_byte_offset]) &
(byte)templ->mysql_null_bit_mask;
}
}
}