mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
fe5bcb475c
- revid:sp1r-svoj@mysql.com/june.mysql.com-20080324111246-00461
- revid:sp1r-svoj@mysql.com/june.mysql.com-20080414125521-40866
BUG#35274 - merge table doesn't need any base tables, gives
error 124 when key accessed
SELECT queries that use index against a merge table with empty
underlying tables list may return with error "Got error 124 from
storage engine".
The problem was that wrong error being returned.
mysql-test/r/merge.result:
Backport of
- revid:sp1r-svoj@mysql.com/june.mysql.com-20080324111246-00461
- revid:sp1r-svoj@mysql.com/june.mysql.com-20080414125521-40866
A test case for BUG#35274.
Modified a test case according to fix for BUG#35274. Key based
reads are now allowed for merge tables with no underlying tables
defined.
mysql-test/t/merge.test:
Backport of
- revid:sp1r-svoj@mysql.com/june.mysql.com-20080324111246-00461
- revid:sp1r-svoj@mysql.com/june.mysql.com-20080414125521-40866
A test case for BUG#35274.
Modified a test case according to fix for BUG#35274. Key based
reads are now allowed for merge tables with no underlying tables
defined.
storage/myisammrg/myrg_queue.c:
Backport of
- revid:sp1r-svoj@mysql.com/june.mysql.com-20080324111246-00461
- revid:sp1r-svoj@mysql.com/june.mysql.com-20080414125521-40866
Return "end of file" error instead of "wrong index" error when
we got a merge table with empty underlying tables list.
In 5.1 we cannot rely on info->open_tables value when checking
if a merge table has no underlying tables defined.
Use info->tables instead.
90 lines
2.7 KiB
C
90 lines
2.7 KiB
C
/* Copyright (C) 2000-2003, 2005 MySQL 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; version 2 of the License.
|
|
|
|
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, uchar *a, uchar *b)
|
|
{
|
|
MYRG_TABLE *ma= (MYRG_TABLE *)a;
|
|
MYRG_TABLE *mb= (MYRG_TABLE *)b;
|
|
MI_INFO *aa= ma->table;
|
|
MI_INFO *bb= mb->table;
|
|
uint not_used[2];
|
|
int ret= ha_key_cmp((HA_KEYSEG *)keyseg, aa->lastkey, bb->lastkey,
|
|
USE_WHOLE_KEY, SEARCH_FIND, not_used);
|
|
if (ret < 0)
|
|
return -1;
|
|
if (ret > 0)
|
|
return 1;
|
|
|
|
/*
|
|
If index tuples have the same values, let the record with least rowid
|
|
value be "smaller", so index scans return records ordered by (keytuple,
|
|
rowid). This is used by index_merge access method, grep for ROR in
|
|
sql/opt_range.cc for details.
|
|
*/
|
|
return (ma->file_offset < mb->file_offset)? -1 : (ma->file_offset >
|
|
mb->file_offset) ? 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
|
|
{
|
|
/*
|
|
inx may be bigger than info->keys if there are no underlying tables
|
|
defined. In this case we should return empty result. As we check for
|
|
underlying tables conformance when we open a table, we may not enter
|
|
this branch with underlying table that has less keys than merge table
|
|
have.
|
|
*/
|
|
DBUG_ASSERT(!info->tables);
|
|
error= my_errno= HA_ERR_END_OF_FILE;
|
|
}
|
|
return error;
|
|
}
|
|
|
|
int _myrg_mi_read_record(MI_INFO *info, uchar *buf)
|
|
{
|
|
if (!(*info->read_record)(info,info->lastpos,buf))
|
|
{
|
|
info->update|= HA_STATE_AKTIV; /* Record is read */
|
|
return 0;
|
|
}
|
|
return my_errno;
|
|
}
|