Commit c8807157 authored by unknown's avatar unknown
Browse files

BUG#5401: post-review fixes

parent 9f62dcfd

innobase/row/row0sel.c

+5 −7
Original line number Diff line number Diff line
@@ -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)
@@ -2751,11 +2750,10 @@ row_sel_pop_cached_row_for_mysql( 
			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;

			}

		}

	}