mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 20:12:31 +01:00
7d915f0193
Crash may happen when selecting from a merge table that has underlying tables with less indexes than in a merge table itself. If number of keys in merge table is not bigger than requested key number, return error. myisammrg/myrg_open.c: Store min(number of keys) in m_info instead of number of keys in last underlying table. myisammrg/myrg_queue.c: Return error if inx passed to _myrg_init_queue function is not less than number of keys. mysql-test/r/merge.result: A test case for bug#21617. mysql-test/t/merge.test: A test case for bug#21617. mysys/queues.c: Replaced annoying ifndef DBUG_OFF with DBUG_ASSERT, fixed coding style. The problem was that having queue overrun in debug build was hidden with this ifdef.
67 lines
2 KiB
C
67 lines
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 */
|
|
|
|
#include "myrg_def.h"
|
|
|
|
static int queue_key_cmp(void *keyseg, byte *a, byte *b)
|
|
{
|
|
MI_INFO *aa=((MYRG_TABLE *)a)->table;
|
|
MI_INFO *bb=((MYRG_TABLE *)b)->table;
|
|
uint not_used[2];
|
|
int ret= ha_key_cmp((HA_KEYSEG *)keyseg, aa->lastkey, bb->lastkey,
|
|
USE_WHOLE_KEY, SEARCH_FIND, not_used);
|
|
return ret < 0 ? -1 : ret > 0 ? 1 : 0;
|
|
} /* queue_key_cmp */
|
|
|
|
|
|
int _myrg_init_queue(MYRG_INFO *info,int inx,enum ha_rkey_function search_flag)
|
|
{
|
|
int error=0;
|
|
QUEUE *q= &(info->by_key);
|
|
|
|
if (inx < (int) info->keys)
|
|
{
|
|
if (!is_queue_inited(q))
|
|
{
|
|
if (init_queue(q,info->tables, 0,
|
|
(myisam_readnext_vec[search_flag] == SEARCH_SMALLER),
|
|
queue_key_cmp,
|
|
info->open_tables->table->s->keyinfo[inx].seg))
|
|
error=my_errno;
|
|
}
|
|
else
|
|
{
|
|
if (reinit_queue(q,info->tables, 0,
|
|
(myisam_readnext_vec[search_flag] == SEARCH_SMALLER),
|
|
queue_key_cmp,
|
|
info->open_tables->table->s->keyinfo[inx].seg))
|
|
error=my_errno;
|
|
}
|
|
}
|
|
else
|
|
my_errno= error= HA_ERR_WRONG_INDEX;
|
|
return error;
|
|
}
|
|
|
|
int _myrg_mi_read_record(MI_INFO *info, byte *buf)
|
|
{
|
|
if (!(*info->read_record)(info,info->lastpos,buf))
|
|
{
|
|
info->update|= HA_STATE_AKTIV; /* Record is read */
|
|
return 0;
|
|
}
|
|
return my_errno;
|
|
}
|