summaryrefslogtreecommitdiff
path: root/myisammrg/myrg_rrnd.c
diff options
context:
space:
mode:
authormonty@donna.mysql.fi <>2001-05-17 00:46:50 +0300
committermonty@donna.mysql.fi <>2001-05-17 00:46:50 +0300
commit2ba0846a60ac43e1ef477bdfd95c37901b6c7fe7 (patch)
treebfa83a61c2689e0f64e7be02d414bcf366c068a1 /myisammrg/myrg_rrnd.c
parentb708df267d6fb180368f84405fbc06006a318f55 (diff)
downloadmariadb-git-2ba0846a60ac43e1ef477bdfd95c37901b6c7fe7.tar.gz
Fixed bug when using MERGE on files > 4G
Fixed bug in SELECT db1.table.* FROM db1.table,db2.table Fixed bug in INSERT DELAYED when doing shutdown and a table was locked Changed that tmp_table_size =4G-1 means unlimited.
Diffstat (limited to 'myisammrg/myrg_rrnd.c')
-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));
}