mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
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
This commit is contained in:
@@ -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););
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user