Commit 00d7f264 authored by unknown's avatar unknown

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

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


storage/myisam/mi_rkey.c:
  Auto merged
parents 78035fb5 fe4551c8
......@@ -60,7 +60,8 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key,
keypart_map, &last_used_keyseg);
/* Save packed_key_length for use by the MERGE engine. */
info->pack_key_length= pack_key_length;
info->last_used_keyseg= last_used_keyseg - info->s->keyinfo[inx].seg;
info->last_used_keyseg= (uint16) (last_used_keyseg -
info->s->keyinfo[inx].seg);
DBUG_EXECUTE("key",_mi_print_key(DBUG_FILE, keyinfo->seg,
key_buff, pack_key_length););
}
......
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