summaryrefslogtreecommitdiff
path: root/myisammrg
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-05-17 00:47:21 +0300
committerunknown <monty@donna.mysql.fi>2001-05-17 00:47:21 +0300
commit5ee5f0dbb8b0b96050cd6f7eaf9819a51ffc01d5 (patch)
tree1441bc29eedff96659ef2faf0ad98c72717c734d /myisammrg
parente40f0f1c3f85c7a2426e10037d0d55542130300c (diff)
parentebe9b6071a73d6953855fd0b2b5144b5b93194fb (diff)
downloadmariadb-git-5ee5f0dbb8b0b96050cd6f7eaf9819a51ffc01d5.tar.gz
Merge work:/home/bk/mysql into donna.mysql.fi:/home/my/bk/mysql
Docs/manual.texi: Auto merged
Diffstat (limited to 'myisammrg')
-rw-r--r--myisammrg/myrg_rrnd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisammrg/myrg_rrnd.c b/myisammrg/myrg_rrnd.c
index 46bd3850bb5..de731e58d5b 100644
--- a/myisammrg/myrg_rrnd.c
+++ b/myisammrg/myrg_rrnd.c
@@ -88,7 +88,7 @@ int myrg_rrnd(MYRG_INFO *info,byte *buf,ulonglong filepos)
isam_info->update&= HA_STATE_CHANGED;
DBUG_RETURN((*isam_info->s->read_rnd)
(isam_info, (byte*) buf,
- (ha_rows) (filepos - info->current_table->file_offset),
+ (my_off_t) (filepos - info->current_table->file_offset),
0));
}