mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
d5964ba20c
Docs/manual.texi: Updated MERGE table stuff + more extra/perror.c: Added missing error messages include/myisammrg.h: Fixes for MERGE TABLE include/queues.h: Fixes for MERGE TABLE isam/isamlog.c: Fixed hard bug myisam/mi_log.c: cleanup myisam/mi_open.c: Fixed file name format in myisam log myisam/myisamlog.c: Bug fixes myisammrg/mymrgdef.h: Fixes for MERGE TABLE myisammrg/myrg_create.c: Fixes for MERGE TABLE myisammrg/myrg_open.c: Fixes for MERGE TABLE myisammrg/myrg_queue.c: Fixes for MERGE TABLE myisammrg/myrg_rfirst.c: Fixes for MERGE TABLE myisammrg/myrg_rkey.c: Fixes for MERGE TABLE myisammrg/myrg_rlast.c: Fixes for MERGE TABLE myisammrg/myrg_rnext.c: Fixes for MERGE TABLE myisammrg/myrg_rprev.c: Fixes for MERGE TABLE myisammrg/myrg_rrnd.c: Fixes for MERGE TABLE mysql.proj: update mysys/queues.c: Fixed bug when using reverse queues sql-bench/test-insert.sh: Separated some things to get better timings sql/ha_heap.cc: Fixed heap table bug sql/ha_heap.h: Fixed heap table bug sql/ha_myisam.h: Fixed wrong max_keys sql/ha_myisammrg.cc: Fixed MERGE TABLES sql/ha_myisammrg.h: Fixed MERGE TABLES sql/handler.h: Fix for MERGE TABLES and HEAP tables sql/lex.h: Fixed MERGE TABLES sql/mysql_priv.h: Cleanup of code sql/sql_acl.cc: Fixed that privilege tables are flushed at start sql/sql_lex.h: Fixed MERGE TABLES sql/sql_parse.cc: Fixed MERGE TABLES sql/sql_select.cc: Fixes for HEAP tables sql/sql_table.cc: Cleanup sql/sql_yacc.yy: Fixed MERGE TABLES
86 lines
2.5 KiB
C
86 lines
2.5 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 */
|
|
|
|
#include "mymrgdef.h"
|
|
|
|
/*
|
|
Read next row with the same key as previous read
|
|
*/
|
|
|
|
int myrg_rnext(MYRG_INFO *info, byte *buf, int inx)
|
|
{
|
|
int err;
|
|
MI_INFO *mi;
|
|
|
|
/* at first, do rnext for the table found before */
|
|
if ((err=mi_rnext(info->current_table->table,NULL,inx)))
|
|
{
|
|
if (err == HA_ERR_END_OF_FILE)
|
|
{
|
|
queue_remove(&(info->by_key),0);
|
|
if (!info->by_key.elements)
|
|
return HA_ERR_END_OF_FILE;
|
|
}
|
|
else
|
|
return err;
|
|
}
|
|
else
|
|
{
|
|
/* Found here, adding to queue */
|
|
queue_top(&(info->by_key))=(byte *)(info->current_table);
|
|
queue_replaced(&(info->by_key));
|
|
}
|
|
|
|
/* next, let's finish myrg_rkey's initial scan */
|
|
if ((err=_myrg_finish_scan(info, inx, HA_READ_KEY_OR_NEXT)))
|
|
return err;
|
|
|
|
/* now, mymerge's read_next is as simple as one queue_top */
|
|
mi=(info->current_table=(MYRG_TABLE *)queue_top(&(info->by_key)))->table;
|
|
return mi_rrnd(mi,buf,mi->lastpos);
|
|
}
|
|
|
|
|
|
/* let's finish myrg_rkey's initial scan */
|
|
|
|
int _myrg_finish_scan(MYRG_INFO *info, int inx, enum ha_rkey_function type)
|
|
{
|
|
int err;
|
|
MYRG_TABLE *table=info->last_used_table;
|
|
if (table < info->end_table)
|
|
{
|
|
MI_INFO *mi= table[-1].table;
|
|
byte *key_buff=(byte*) mi->lastkey+mi->s->base.max_key_length;
|
|
uint pack_key_length= mi->last_rkey_length;
|
|
|
|
for (; table < info->end_table ; table++)
|
|
{
|
|
mi=table->table;
|
|
if ((err=_mi_rkey(mi,NULL,inx,key_buff,pack_key_length,
|
|
type,FALSE)))
|
|
{
|
|
if (err == HA_ERR_KEY_NOT_FOUND) /* If end of file */
|
|
continue;
|
|
return err;
|
|
}
|
|
/* Found here, adding to queue */
|
|
queue_insert(&(info->by_key),(byte *) table);
|
|
}
|
|
/* All tables are now used */
|
|
info->last_used_table=table;
|
|
}
|
|
return 0;
|
|
}
|