From ebe9b6071a73d6953855fd0b2b5144b5b93194fb Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 17 May 2001 00:46:50 +0300 Subject: 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. Docs/manual.texi: Added new section about crashed MyISAM tables. Cleaned up subsections for InnoDB client/mysql.cc: Cleanup myisam/mi_rkey.c: Cleanup myisam/mi_search.c: Fixed wrong casts in debug messages myisammrg/myrg_rrnd.c: Fixed bug when using files > 4G mysys/getvar.c: Changed to use longlong to support arguments up to 4G mysys/thr_lock.c: Fix for delay insert sql/mysqld.cc: Increased default size for temporary tables sql/sql_base.cc: Fixed bug in SELECT db1.table.* FROM db1.table,db2.table sql/sql_insert.cc: Fixed bug in INSERT DELAYED when doing shutdown and a table was locked sql/sql_select.cc: Changed that tmp_table_size =4G-1 means unlimited. --- myisammrg/myrg_rrnd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'myisammrg') 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)); } -- cgit v1.2.1