Commit 19a38fb1 authored by unknown's avatar unknown
Browse files

Trivial post-merge fixes

parent eeb99f50

myisam/mi_key.c

+2 −2
Original line number Diff line number Diff line
@@ -241,8 +241,8 @@ uint _mi_pack_key(register MI_INFO *info, uint keynr, uchar *key, uchar *old, 
      if (!(*key++= (char) 1-*old++))			/* Copy null marker */

      {

	k_length-=length;

->flag & (HA_VAR_LENGTH_PART | HA_BLOB_PART))



        if (keyseg->flag & (HA_VAR_LENGTH_PART | HA_BLOB_PART))

        {

          k_length-=2;                                  /* Skip length */

          old+= 2;

        }