diff options
| author | unknown <svoj@mysql.com/june.mysql.com> | 2007-04-19 11:56:06 +0500 |
|---|---|---|
| committer | unknown <svoj@mysql.com/june.mysql.com> | 2007-04-19 11:56:06 +0500 |
| commit | 5d7c9c506e7bee15c63a71223dadd6205eb75f37 (patch) | |
| tree | fad5c10ae597ffbdf8267fb00d06c83f26565760 /myisam | |
| parent | 4cd53aca5b50f210c338e7544c3c3162f6b86d3e (diff) | |
| parent | 708816b1405a007c3b6b36146cd4b981266989dc (diff) | |
| download | mariadb-git-5d7c9c506e7bee15c63a71223dadd6205eb75f37.tar.gz | |
Merge mysql.com:/home/svoj/devel/mysql/warn/mysql-4.1-engines
into mysql.com:/home/svoj/devel/mysql/warn/mysql-5.0-engines
myisam/mi_rkey.c:
Auto merged
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/mi_rkey.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/myisam/mi_rkey.c b/myisam/mi_rkey.c index f9fbe559a62..83259a275b1 100644 --- a/myisam/mi_rkey.c +++ b/myisam/mi_rkey.c @@ -61,7 +61,8 @@ int mi_rkey(MI_INFO *info, byte *buf, int inx, const byte *key, uint key_len, key_len, &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);); } |