mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01: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
56 lines
1.7 KiB
C
56 lines
1.7 KiB
C
/* Copyright (C) 2000-2002 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 */
|
|
|
|
/* re-read current record */
|
|
|
|
#include "heapdef.h"
|
|
|
|
/* If inx != -1 the new record is read according to index
|
|
(for next/prev). Record must in this case point to last record
|
|
Returncodes:
|
|
0 = Ok.
|
|
HA_ERR_RECORD_DELETED = Record was removed
|
|
HA_ERR_KEY_NOT_FOUND = Record not found with key
|
|
*/
|
|
|
|
int heap_rsame(register HP_INFO *info, uchar *record, int inx)
|
|
{
|
|
HP_SHARE *share=info->s;
|
|
DBUG_ENTER("heap_rsame");
|
|
|
|
test_active(info);
|
|
if (info->current_ptr[share->reclength])
|
|
{
|
|
if (inx < -1 || inx >= (int) share->keys)
|
|
{
|
|
DBUG_RETURN(my_errno=HA_ERR_WRONG_INDEX);
|
|
}
|
|
else if (inx != -1)
|
|
{
|
|
info->lastinx=inx;
|
|
hp_make_key(share->keydef + inx, info->lastkey, record);
|
|
if (!hp_search(info, share->keydef + inx, info->lastkey, 3))
|
|
{
|
|
info->update= 0;
|
|
DBUG_RETURN(my_errno);
|
|
}
|
|
}
|
|
memcpy(record,info->current_ptr,(size_t) share->reclength);
|
|
DBUG_RETURN(0);
|
|
}
|
|
info->update=0;
|
|
|
|
DBUG_RETURN(my_errno=HA_ERR_RECORD_DELETED);
|
|
}
|