mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 18:20:07 +01:00
df843c4ce2
Fixed bug in ma_test2 when last row in table is deleted Fixed that ma_test_recovery.pl works on Solaris (by using digest instead of md5sum) Fixed some compiler warnings generated by the Forte compiler dbug/dbug.c: Added cast to get rid of compiler warning mysys/lf_alloc-pin.c: Added cast to get rid of compiler warning mysys/my_bitmap.c: Removed impossible DBUG_ASSERT()'s to get rid of compiler warnings mysys/my_compress.c: Removed wrong cast to get rid of compiler warning storage/maria/lockman.c: Added cast to get rid of compiler warning storage/maria/ma_open.c: Added fix from MyISAM to allocate space in key buffer for nod pointer storage/maria/ma_recovery.c: Fixed initialization that caused compiler warning storage/maria/ma_rsame.c: More DBUG_PRINT storage/maria/ma_scan.c: Better comment storage/maria/ma_statrec.c: More DBUG_PRINT and comments Fixed indentation BitKeeper/etc/ignore: added storage/maria/unittest/tmp/* storage/maria/ma_test2.c: Fixed bug that caused maria_rsame() to fail if test removed last row Fixed wrong usage of longget(); Should be uint4korr() storage/maria/unittest/ma_test_recovery.pl: Use md5sum or digest to calculate md5. This allows this script to be run on Linux and Solaris storage/myisam/mi_test2.c: Fixed wrong usage of longget(); Should be uint4korr() strings/ctype.c: Added casts to get rid of compiler warnings sql-bench/myisam.cnf: New BitKeeper file ``sql-bench/myisam.cnf''
72 lines
2.3 KiB
C
72 lines
2.3 KiB
C
/* Copyright (C) 2006 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; 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 "maria_def.h"
|
|
|
|
/*
|
|
Find current row with read on position or read on key
|
|
|
|
NOTES
|
|
If inx >= 0 find record using key
|
|
|
|
RETURN
|
|
0 Ok
|
|
HA_ERR_KEY_NOT_FOUND Row is deleted
|
|
HA_ERR_END_OF_FILE End of file
|
|
*/
|
|
|
|
|
|
int maria_rsame(MARIA_HA *info, uchar *record, int inx)
|
|
{
|
|
DBUG_ENTER("maria_rsame");
|
|
|
|
if (inx != -1 && ! maria_is_key_active(info->s->state.key_map, inx))
|
|
{
|
|
DBUG_PRINT("error", ("wrong index usage"));
|
|
DBUG_RETURN(my_errno=HA_ERR_WRONG_INDEX);
|
|
}
|
|
if (info->cur_row.lastpos == HA_OFFSET_ERROR ||
|
|
info->update & HA_STATE_DELETED)
|
|
{
|
|
DBUG_PRINT("error", ("no current record"));
|
|
DBUG_RETURN(my_errno=HA_ERR_KEY_NOT_FOUND); /* No current record */
|
|
}
|
|
info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
|
|
|
|
/* Read row from data file */
|
|
if (fast_ma_readinfo(info))
|
|
DBUG_RETURN(my_errno);
|
|
|
|
if (inx >= 0)
|
|
{
|
|
info->lastinx=inx;
|
|
info->lastkey_length= _ma_make_key(info,(uint) inx,info->lastkey,record,
|
|
info->cur_row.lastpos);
|
|
if (info->s->concurrent_insert)
|
|
rw_rdlock(&info->s->key_root_lock[inx]);
|
|
VOID(_ma_search(info,info->s->keyinfo+inx,info->lastkey, USE_WHOLE_KEY,
|
|
SEARCH_SAME,
|
|
info->s->state.key_root[inx]));
|
|
if (info->s->concurrent_insert)
|
|
rw_unlock(&info->s->key_root_lock[inx]);
|
|
}
|
|
|
|
if (!(*info->read_record)(info, record, info->cur_row.lastpos))
|
|
DBUG_RETURN(0);
|
|
if (my_errno == HA_ERR_RECORD_DELETED)
|
|
my_errno=HA_ERR_KEY_NOT_FOUND;
|
|
DBUG_PRINT("error", ("my_errno: %d", my_errno));
|
|
DBUG_RETURN(my_errno);
|
|
} /* maria_rsame */
|