mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
5c68c9042a
Fixed bug with ALTER TABLE on HEAP tables mysql-test/r/alter_table.result: Turn off SCCS flag mysql-test/r/analyse.result: Turn off SCCS flag mysql-test/r/auto_increment.result: Turn off SCCS flag mysql-test/r/bdb.result: Turn off SCCS flag mysql-test/r/bigint.result: Turn off SCCS flag mysql-test/r/binary.result: Turn off SCCS flag mysql-test/r/case.result: Turn off SCCS flag mysql-test/r/comments.result: Turn off SCCS flag mysql-test/r/compare.result: Turn off SCCS flag mysql-test/r/count_distinct.result: Turn off SCCS flag mysql-test/r/create.result: Turn off SCCS flag mysql-test/r/delayed.result: Turn off SCCS flag mysql-test/r/distinct.result: Turn off SCCS flag mysql-test/r/empty_table.result: Turn off SCCS flag mysql-test/r/explain.result: Turn off SCCS flag mysql-test/r/ft0000001.a.result: Turn off SCCS flag mysql-test/r/ft0000001.b.result: Turn off SCCS flag mysql-test/r/ft0000001.c.result: Turn off SCCS flag mysql-test/r/ft0000001.d.result: Turn off SCCS flag mysql-test/r/ft0000001.e.result: Turn off SCCS flag mysql-test/r/ft0000002.a.result: Turn off SCCS flag mysql-test/r/ft0000002.b.result: Turn off SCCS flag mysql-test/r/ft0000002.c.result: Turn off SCCS flag mysql-test/r/fulltext.result: Turn off SCCS flag mysql-test/r/func_crypt.result: Turn off SCCS flag mysql-test/r/func_date_add.result: Turn off SCCS flag mysql-test/r/func_equal.result: Turn off SCCS flag mysql-test/r/func_group.result: Turn off SCCS flag mysql-test/r/func_in.result: Turn off SCCS flag mysql-test/r/func_like.result: Turn off SCCS flag mysql-test/r/func_math.result: Turn off SCCS flag mysql-test/r/func_misc.result: Turn off SCCS flag mysql-test/r/func_op.result: Turn off SCCS flag mysql-test/r/func_regexp.result: Turn off SCCS flag mysql-test/r/func_set.result: Turn off SCCS flag mysql-test/r/func_str.result: Turn off SCCS flag mysql-test/r/func_system.result: Turn off SCCS flag mysql-test/r/func_test.result: Turn off SCCS flag mysql-test/r/func_time.result: Turn off SCCS flag mysql-test/r/group_by.result: Turn off SCCS flag mysql-test/r/heap.result: Turn off SCCS flag mysql-test/r/ins000001.result: Turn off SCCS flag mysql-test/r/insert.result: Turn off SCCS flag mysql-test/r/insert_select.result: Turn off SCCS flag mysql-test/r/join.result: Turn off SCCS flag mysql-test/r/join_outer.result: Turn off SCCS flag mysql-test/r/key.result: Turn off SCCS flag mysql-test/r/key_diff.result: Turn off SCCS flag mysql-test/r/key_primary.result: Turn off SCCS flag mysql-test/r/keywords.result: Turn off SCCS flag mysql-test/r/limit.result: Turn off SCCS flag mysql-test/r/merge.result: Turn off SCCS flag mysql-test/r/null.result: Turn off SCCS flag mysql-test/r/null_key.result: Turn off SCCS flag mysql-test/r/odbc.result: Turn off SCCS flag mysql-test/r/order_by.result: Turn off SCCS flag mysql-test/r/raid.result: Turn off SCCS flag mysql-test/r/range.result: Turn off SCCS flag mysql-test/r/rename.result: Turn off SCCS flag mysql-test/r/replace.result: Turn off SCCS flag mysql-test/r/rollback.result: Turn off SCCS flag mysql-test/r/rpl000001.a.result: Turn off SCCS flag mysql-test/r/rpl000001.b.result: Turn off SCCS flag mysql-test/r/rpl000002.result: Turn off SCCS flag mysql-test/r/rpl000003.result: Turn off SCCS flag mysql-test/r/rpl000004.a.result: Turn off SCCS flag mysql-test/r/rpl000004.b.result: Turn off SCCS flag mysql-test/r/rpl000005.result: Turn off SCCS flag mysql-test/r/rpl000006.result: Turn off SCCS flag mysql-test/r/rpl000007.result: Turn off SCCS flag mysql-test/r/rpl000008.result: Turn off SCCS flag mysql-test/r/rpl000009.result: Turn off SCCS flag mysql-test/r/rpl000010.result: Turn off SCCS flag mysql-test/r/rpl000011.result: Turn off SCCS flag mysql-test/r/rpl000012.result: Turn off SCCS flag mysql-test/r/rpl000012.status.result: Turn off SCCS flag mysql-test/r/rpl000013.result: Turn off SCCS flag mysql-test/r/rpl000013.status.result: Turn off SCCS flag mysql-test/r/rpl000014.result: Turn off SCCS flag mysql-test/r/rpl000015.result: Turn off SCCS flag mysql-test/r/rpl000016.result: Turn off SCCS flag mysql-test/r/sel000001.result: Turn off SCCS flag mysql-test/r/sel000002.result: Turn off SCCS flag mysql-test/r/sel000003.result: Turn off SCCS flag mysql-test/r/sel000031.result: Turn off SCCS flag mysql-test/r/sel000032.result: Turn off SCCS flag mysql-test/r/sel000033.result: Turn off SCCS flag mysql-test/r/sel000100.result: Turn off SCCS flag mysql-test/r/select_safe.result: Turn off SCCS flag mysql-test/r/show_check.result: Turn off SCCS flag mysql-test/r/shw000001.result: Turn off SCCS flag mysql-test/r/slave-running.result: Turn off SCCS flag mysql-test/r/slave-stopped.result: Turn off SCCS flag mysql-test/r/tablelock.result: Turn off SCCS flag mysql-test/r/temp_table.result: Turn off SCCS flag mysql-test/r/truncate.result: Turn off SCCS flag mysql-test/r/type_blob.result: Turn off SCCS flag mysql-test/r/type_date.result: Turn off SCCS flag mysql-test/r/type_datetime.result: Turn off SCCS flag mysql-test/r/type_enum.result: Turn off SCCS flag mysql-test/r/type_float.result: Turn off SCCS flag mysql-test/r/type_ranges.result: Turn off SCCS flag mysql-test/r/type_time.result: Turn off SCCS flag mysql-test/r/type_timestamp.result: Turn off SCCS flag mysql-test/r/type_uint.result: Turn off SCCS flag mysql-test/r/type_year.result: Turn off SCCS flag mysql-test/r/update.result: Turn off SCCS flag mysql-test/r/varbinary.result: Turn off SCCS flag mysql-test/r/variables.result: Turn off SCCS flag Docs/manual.texi: Changelog client/my_readline.h: Added read length to readline() client/mysql.cc: cleanup client/mysqladmin.c: cleanup client/mysqldump.c: Added handling of hexadecimal constants client/mysqlimport.c: Version change client/mysqltest.c: Don't append the .reject extension, instead replace the old extension client/readline.cc: Added read length to readline() heap/hp_open.c: extra debug merge/rrnd.c: Fix bug in merge tables mysql-test/install_test_db.sh: Portability fixes mysql-test/mysql-test-run.sh: Portability fixes Added --ddd and --debug options scripts/mysqld_multi.sh: Add pathname to mysqladmin sql-bench/Results/ATIS-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/RUN-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/alter-table-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/big-tables-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/connect-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/create-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/insert-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/select-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql-bench/Results/wisconsin-mysql-Linux_2.2.13_SMP_alpha: New benchmark results sql/mysqld.cc: Some fixes for gemini sql/sql_table.cc: Fixed bug with ALTER TABLE on HEAP tables
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-1,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;
|
|
}
|