diff options
| author | unknown <svoj@june.mysql.com> | 2007-04-19 11:59:20 +0500 |
|---|---|---|
| committer | unknown <svoj@june.mysql.com> | 2007-04-19 11:59:20 +0500 |
| commit | 00d7f26410d0275cd3b119d28ea6e0876a37616a (patch) | |
| tree | 3a6164045a4fae2ea8743aad290091afb2936dab /storage/myisam/mi_rkey.c | |
| parent | 78035fb5d5cd237fa545493b644e70118d73bfff (diff) | |
| parent | fe4551c812a82349a31266b317bbee381a36572b (diff) | |
| download | mariadb-git-00d7f26410d0275cd3b119d28ea6e0876a37616a.tar.gz | |
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
Diffstat (limited to 'storage/myisam/mi_rkey.c')
| -rw-r--r-- | storage/myisam/mi_rkey.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/myisam/mi_rkey.c b/storage/myisam/mi_rkey.c index a4be66bd4f2..a69e276a6d8 100644 --- a/storage/myisam/mi_rkey.c +++ b/storage/myisam/mi_rkey.c @@ -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);); } |