Commit 82a91f6e authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/svoj/devel/mysql/BUG22053/mysql-5.0-engines 

into  mysql.com:/home/svoj/devel/mysql/BUG22053/mysql-5.1-engines


storage/myisam/mi_dynrec.c:
  Auto merged
parents 94f337bb 79d9d38d

storage/myisam/mi_dynrec.c

+5 −3
Original line number Diff line number Diff line
@@ -1203,8 +1203,10 @@ ulong _mi_rec_unpack(register MI_INFO *info, register byte *to, byte *from, 
      {

	uint size_length=rec_length- mi_portable_sizeof_char_ptr;

	ulong blob_length=_mi_calc_blob_length(size_length,from);

	if ((ulong) (from_end-from) - size_length < blob_length ||

	    min_pack_length > (uint) (from_end -(from+size_length+blob_length)))

        ulong from_left= (ulong) (from_end - from);

        if (from_left < size_length ||

            from_left - size_length < blob_length ||

            from_left - size_length - blob_length < min_pack_length)

          goto err;

	memcpy((byte*) to,(byte*) from,(size_t) size_length);

	from+=size_length;