mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
8b3993bc01
Docs/Makefile.am: Removed typo Docs/internals.texi: Added documentation about filesort Docs/manual.texi: Lots of changes, including information about the password in the mysql.user table config.h.in: ***MISSING WEAVE*** heap/hp_rnext.c: Fix of reading of read-next include/config-win.h: Fix for Ia64 include/global.h: Fix for Ia64 include/my_base.h: Fix for Ia64 include/myisam.h: New repair options isam/_dynrec.c: Typo fixes isam/_search.c: Fix for Ia64 merge/rrnd.c: Fix of ORDER BY for MERGE tables myisam/ft_eval.c: Fix for Ia64 myisam/ft_parser.c: Fix for Ia64 myisam/ft_static.c: Portability fixes myisam/mi_check.c: Fix for Ia64 + delay key creation myisam/mi_locking.c: Portability fixes myisam/myisamdef.h: Fixes for automatic table repair myisam/myisampack.c: Version number increment myisammrg/myrg_rrnd.c: Fix of ORDER BY for mymerge tables mysql.proj: Updated mysys/charset.c: Fix for Ia64 mysys/mf_casecnv.c: Fix for Ia64 mysys/mf_pack.c: Fix for Ia64 mysys/mf_path.c: Fix for Ia64 mysys/mf_wfile.c: Fix for Ia64 mysys/my_alloc.c: Fix for Ia64 mysys/my_lib.c: Fix for Ia64 mysys/my_lread.c: Fix for Ia64 mysys/my_lwrite.c: Fix for Ia64 mysys/my_winthread.c: Fix for Ia64 mysys/string.c: Fix for Ia64 mysys/thr_alarm.c: Fix for Ia64 mysys/thr_rwlock.c: Fix of scheduler bug for systems without rw_locks regex/regcomp.c: Fix for Ia64 regex/regex.h: Fix for Ia64 regex/regex2.h: Fix for Ia64 scripts/mysqlhotcopy.sh: Explicit version number (because of bitkeeper) sql-bench/bench-init.pl.sh: New help message sql-bench/server-cfg.sh: Updates for postgreSQL 7.0 sql/ChangeLog: Changelog sql/field.cc: Fix of datetime function handling sql/filesort.cc: More comments sql/gen_lex_hash.cc: More options sql/ha_berkeley.cc: Fix for part key reading sql/ha_berkeley.h: Indentation sql/ha_myisam.cc: Fix for delayed key creation sql/ha_myisam.h: Fix for delayed key creation sql/handler.h: Fix for delayed key creation sql/item_func.cc: Fix of crash when using constant expression with UDF functions in WHERE sql/item_timefunc.cc: Fix of datetime function handling sql/mini_client.cc: Portability fix sql/mysql_priv.h: Optimization of select initialization sql/mysqld.cc: Portability fixes, thread cache and min argument for connect_timeout sql/sql_load.cc: Delayed key handling sql/sql_parse.cc: Portability fixes and select initialization optimization sql/sql_select.cc: Small optimization + more comments sql/sql_table.cc: Fix default value adding to blob with alter table + delayed index creation sql/sql_yacc.yy: Optimized select initialization sql/structs.h: Fix for part key read strings/ctype-sjis.c: Fix for Ia64 strings/ctype-tis620.c: Fix for Ia64 strings/t_ctype.h: bk fix support-files/mysql.spec.sh: Added comment vio/viotest-ssl.cc: bk fix vio/viotest-sslconnect.cc: bk fix vio/viotest.cc: bk fix BitKeeper/etc/logging_ok: Logging to logging@openlogging.org accepted
110 lines
3.2 KiB
C
110 lines
3.2 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
/*
|
|
Read a record with random-access. The position to the record must
|
|
get by mrg_info(). The next record can be read with pos= -1 */
|
|
|
|
|
|
#include "mrgdef.h"
|
|
|
|
static MRG_TABLE *find_table(MRG_TABLE *start,MRG_TABLE *end,mrg_off_t pos);
|
|
|
|
/*
|
|
If filepos == -1, read next
|
|
Returns same as nisam_rrnd:
|
|
0 = Ok.
|
|
1 = Record deleted.
|
|
-1 = EOF (or something, errno should be HA_ERR_END_OF_FILE)
|
|
*/
|
|
|
|
int mrg_rrnd(MRG_INFO *info,byte *buf,mrg_off_t filepos)
|
|
{
|
|
int error;
|
|
N_INFO *isam_info;
|
|
|
|
if (filepos == ~(mrg_off_t) 0) /* Can't use HA_POS_ERROR */
|
|
{
|
|
if (!info->current_table)
|
|
{
|
|
if (info->open_tables == info->end_table)
|
|
{ /* No tables */
|
|
my_errno=HA_ERR_END_OF_FILE;
|
|
return -1;
|
|
}
|
|
isam_info=(info->current_table=info->open_tables)->table;
|
|
if (info->cache_in_use)
|
|
nisam_extra(isam_info,HA_EXTRA_CACHE);
|
|
filepos=isam_info->s->pack.header_length;
|
|
isam_info->lastinx= (uint) -1; /* Can't forward or backward */
|
|
}
|
|
else
|
|
{
|
|
isam_info=info->current_table->table;
|
|
filepos= isam_info->nextpos;
|
|
}
|
|
|
|
for (;;)
|
|
{
|
|
isam_info->update&= HA_STATE_CHANGED;
|
|
if ((error=(*isam_info->s->read_rnd)(isam_info,(byte*) buf,
|
|
filepos,1)) >= 0 ||
|
|
my_errno != HA_ERR_END_OF_FILE)
|
|
return (error);
|
|
if (info->cache_in_use)
|
|
nisam_extra(info->current_table->table,HA_EXTRA_NO_CACHE);
|
|
if (info->current_table+1 == info->end_table)
|
|
return(-1);
|
|
info->current_table++;
|
|
info->last_used_table=info->current_table;
|
|
if (info->cache_in_use)
|
|
nisam_extra(info->current_table->table,HA_EXTRA_CACHE);
|
|
info->current_table->file_offset=
|
|
info->current_table[-1].file_offset+
|
|
info->current_table[-1].table->s->state.data_file_length;
|
|
|
|
isam_info=info->current_table->table;
|
|
filepos=isam_info->s->pack.header_length;
|
|
isam_info->lastinx= (uint) -1;
|
|
}
|
|
}
|
|
info->current_table=find_table(info->open_tables,
|
|
info->end_table,filepos);
|
|
isam_info=info->current_table->table;
|
|
isam_info->update&= HA_STATE_CHANGED;
|
|
return ((*isam_info->s->read_rnd)(isam_info,(byte*) buf,
|
|
(ulong) (filepos -
|
|
info->current_table->file_offset),
|
|
0));
|
|
}
|
|
|
|
|
|
/* Find which table to use according to file-pos */
|
|
|
|
static MRG_TABLE *find_table(MRG_TABLE *start,MRG_TABLE *end,mrg_off_t pos)
|
|
{
|
|
MRG_TABLE *mid;
|
|
|
|
while (start != end)
|
|
{
|
|
mid=start+((uint) (end-start)+1)/2;
|
|
if (mid->file_offset > pos)
|
|
end=mid-1;
|
|
else
|
|
start=mid;
|
|
}
|
|
return start;
|
|
}
|