Commit 84101eb8 authored by sergefp@mysql.com's avatar sergefp@mysql.com

Trivial post-merge fixes

parent c5276ebc
......@@ -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;
}
......
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