mirror of
https://github.com/MariaDB/server.git
synced 2025-08-30 11:22:14 +03:00
6c610ed979
- Linking now with g++ instead of gcc with 'compile-dist' to solve problems with handlersocket/client - Fixed bug in heap tables when doing handler read next-prev over last row BUILD/compile-dist: - Linking now with g++ instead of gcc with 'compile-dist' to solve problems with handlersocket/client cmd-line-utils/libedit/vi.c: Fixed compiler warning about not checking return value for write mysql-test/r/index_intersect.result: Updated results (missed this file in my last push) mysql-test/suite/handler/aria.result: Updated test results mysql-test/suite/handler/handler.inc: Changed test to use read next/read prev on key where there are duplicates that can come in different order depending on system Added testing of read next-prev over last row and read prev-next around first row mysql-test/suite/handler/heap.result: Updated test results mysql-test/suite/handler/init.inc: More rows to test mysql-test/suite/handler/innodb.result: Updated test results mysql-test/suite/handler/interface.result: Updated test results mysql-test/suite/handler/myisam.result: Updated test results mysql-test/t/variables-big.test: Fixed test to not fail on windows mysql-test/valgrind.supp: Removed not matching fun: to get rid of valgrind warning storage/heap/hp_rfirst.c: Added state so that we know if we have an active position in the index. storage/heap/hp_rkey.c: Added state so that we know if we have an active position in the index. storage/heap/hp_rnext.c: Handle reading several next after finding the last row (this caused a crash before) storage/heap/hp_rprev.c: Handle reading several prev after finding the first row (this caused a crash before) storage/xtradb/buf/buf0buf.c: Fixed compiler warning about uninitialized value
82 lines
2.7 KiB
C
82 lines
2.7 KiB
C
/* Copyright (C) 2000-2004, 2006 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 "heapdef.h"
|
|
|
|
int heap_rkey(HP_INFO *info, uchar *record, int inx, const uchar *key,
|
|
key_part_map keypart_map, enum ha_rkey_function find_flag)
|
|
{
|
|
uchar *pos;
|
|
HP_SHARE *share= info->s;
|
|
HP_KEYDEF *keyinfo= share->keydef + inx;
|
|
DBUG_ENTER("heap_rkey");
|
|
DBUG_PRINT("enter",("info: 0x%lx inx: %d", (long) info, inx));
|
|
|
|
if ((uint) inx >= share->keys)
|
|
{
|
|
DBUG_RETURN(my_errno= HA_ERR_WRONG_INDEX);
|
|
}
|
|
info->lastinx= inx;
|
|
info->current_record= (ulong) ~0L; /* For heap_rrnd() */
|
|
info->key_version= info->s->key_version;
|
|
|
|
if (keyinfo->algorithm == HA_KEY_ALG_BTREE)
|
|
{
|
|
heap_rb_param custom_arg;
|
|
|
|
custom_arg.keyseg= info->s->keydef[inx].seg;
|
|
custom_arg.key_length= info->lastkey_len=
|
|
hp_rb_pack_key(keyinfo, (uchar*) info->lastkey,
|
|
(uchar*) key, keypart_map);
|
|
custom_arg.search_flag= SEARCH_FIND | SEARCH_SAME;
|
|
/* for next rkey() after deletion */
|
|
if (find_flag == HA_READ_AFTER_KEY)
|
|
info->last_find_flag= HA_READ_KEY_OR_NEXT;
|
|
else if (find_flag == HA_READ_BEFORE_KEY)
|
|
info->last_find_flag= HA_READ_KEY_OR_PREV;
|
|
else
|
|
info->last_find_flag= find_flag;
|
|
if (!(pos= tree_search_key(&keyinfo->rb_tree, info->lastkey, info->parents,
|
|
&info->last_pos, find_flag, &custom_arg)))
|
|
{
|
|
info->update= HA_STATE_NO_KEY;
|
|
DBUG_RETURN(my_errno= HA_ERR_KEY_NOT_FOUND);
|
|
}
|
|
memcpy(&pos, pos + (*keyinfo->get_key_length)(keyinfo, pos), sizeof(uchar*));
|
|
info->current_ptr= pos;
|
|
}
|
|
else
|
|
{
|
|
if (!(pos= hp_search(info, share->keydef + inx, key, 0)))
|
|
{
|
|
info->update= HA_STATE_NO_KEY;
|
|
DBUG_RETURN(my_errno);
|
|
}
|
|
if (!(keyinfo->flag & HA_NOSAME))
|
|
memcpy(info->lastkey, key, (size_t) keyinfo->length);
|
|
}
|
|
memcpy(record, pos, (size_t) share->reclength);
|
|
info->update= HA_STATE_AKTIV;
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
/* Quick find of record */
|
|
|
|
uchar* heap_find(HP_INFO *info, int inx, const uchar *key)
|
|
{
|
|
return hp_search(info, info->s->keydef + inx, key, 0);
|
|
}
|