mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
d2b8d744d9
Moved things into ft_global.h, my_handler.h and myisamchk.h to allow MyISAM and Maria to share code and defines Rename of not properly renamed functions in MyISAM and my_handler.c Renamed some MI_ defines to HA_ to allow MyISAM and Maria to share Added maria variables to mysqld.cc and set_var.cc Fixed compiler warnings BitKeeper/etc/ignore: added storage/maria/*.MAI BUILD/SETUP.sh: Compile maria by default BitKeeper/triggers/post-commit: No public maria emails. Mark changesets emails with 'maria' configure.in: Add maria include/ft_global.h: Move defines needed by maria and MyISAM here include/keycache.h: Add support for default key_cache if cache not found include/my_base.h: Add invalidator_by_filename include/my_handler.h: Remove duplicate header files Add defines that are typical for handlers (MyISAM and Maria) include/myisam.h: Move things to my_handler.h to allow Maria and MyISAM to share things (Some things needed to be shared to allow sharing of HA_CHECK structure) libmysqld/Makefile.am: Added ha_maria.cc mysys/mf_keycaches.c: Added default value for multi_key_cache_search mysys/my_handler.c: mi_compare_text -> ha_compare_text Removed compiler warnings sql/ha_myisam.cc: MI_CHECK -> HA_CHECK MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH sql/ha_myisam.h: MI_CHECK -> HA_CHECK MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH sql/ha_myisammrg.h: MI_CHECK -> HA_CHECK MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH sql/handler.h: Added MARIA Added inclusion of my_handler.h sql/item_func.h: Remove duplicate include sql/mysql_priv.h: Added maria variables sql/mysqld.cc: Added maria sql/set_var.cc: Added maria status variables sql/set_var.h: Added maria sql/sql_class.h: Added maria status variables sql/sql_sort.h: Remove duplicate BUFFPEK struct storage/Makefile.am: Added maria storage/csv/ha_tina.cc: Removed compiler warning storage/myisam/Makefile.am: Added ft_myisam.c storage/myisam/ft_boolean_search.c: mi_compare_text -> ha_compare_text MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF Remove compiler warnings storage/myisam/ft_nlq_search.c: mi_compare_text -> ha_compare_text storage/myisam/ft_parser.c: mi_compare_text -> ha_compare_text storage/myisam/ft_static.c: Move ft_init_search() to ft_myisam.c to make ft_static.c independent of MyISAM storage/myisam/ft_stopwords.c: mi_compare_text -> ha_compare_text storage/myisam/ft_update.c: mi_compare_text -> ha_compare_text storage/myisam/fulltext.h: Move things to ft_global.h to allow to share more things between MyISAM and Maria storage/myisam/mi_check.c: MI_CHECK -> HA_CHECK storage/myisam/mi_create.c: MI_MAX_POSSIBLE_KEY -> HA_MAX_POSSIBLE_KEY MI_MAX_KEY_BLOCK_SIZE -> HA_MAX_KEY_BLOCK_SIZE MI_MAX_KEY_SEG -> HA_MAX_KEY_SEG MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF storage/myisam/mi_delete.c: MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF storage/myisam/mi_delete_all.c: Remove not used variable storage/myisam/mi_dynrec.c: _my_calc_total_blob_length -> _mi_calc_total_blob_length storage/myisam/mi_key.c: _my_store_blob_length -> _mi_store_blob_length storage/myisam/mi_log.c: _my_calc_total_blob_length -> _mi_calc_total_blob_length storage/myisam/mi_open.c: MI_MAX_POSSIBLE_KEY -> HA_MAX_POSSIBLE_KEY MI_MAX_KEY_SEG -> HA_MAX_KEY_SEG MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF my_n_base_info_read -> mi_n_base_info_read storage/myisam/mi_packrec.c: Made read_pack_length static _my_store_blob_length -> _mi_store_blob_length Remove not used variable storage/myisam/mi_range.c: MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF storage/myisam/mi_search.c: MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF storage/myisam/mi_test1.c: MI_MAX_KEY_LENGTH -> HA_MAX_KEY_LENGTH storage/myisam/mi_test2.c: Fixed compiler warning storage/myisam/mi_unique.c: Fixed compiler warning mi_compare_text -> ha_compare_text storage/myisam/mi_update.c: MI_MAX_KEY_BUFF -> HA_MAX_KEY_BUFF storage/myisam/mi_write.c: Rename of defines and functions storage/myisam/myisamchk.c: Rename of defines and functions storage/myisam/myisamdef.h: Remove tabs Indentation fixes (Large changes as I did run indent-ex on the file) Move some things to myisamchk.h Added missing functions that gave compiler warnings storage/myisam/myisamlog.c: Rename of defines and functions storage/myisam/myisampack.c: Remove compiler warning storage/myisam/rt_index.c: Rename of defines and functions storage/myisam/sort.c: Rename of defines, functions and structures config/ac-macros/ha_maria.m4: New BitKeeper file ``config/ac-macros/ha_maria.m4'' include/maria.h: New BitKeeper file ``include/maria.h'' include/myisamchk.h: New BitKeeper file ``include/myisamchk.h'' libmysqld/ha_maria.cc: New BitKeeper file ``libmysqld/ha_maria.cc'' mysql-test/include/have_maria.inc: New BitKeeper file ``mysql-test/include/have_maria.inc'' mysql-test/r/have_maria.require: New BitKeeper file ``mysql-test/r/have_maria.require'' mysql-test/r/maria.result: New BitKeeper file ``mysql-test/r/maria.result'' mysql-test/r/ps_maria.result: New BitKeeper file ``mysql-test/r/ps_maria.result'' mysql-test/t/maria.test: New BitKeeper file ``mysql-test/t/maria.test'' mysql-test/t/ps_maria.test: New BitKeeper file ``mysql-test/t/ps_maria.test'' sql/ha_maria.cc: New BitKeeper file ``sql/ha_maria.cc'' sql/ha_maria.h: New BitKeeper file ``sql/ha_maria.h'' storage/maria/Makefile.am: New BitKeeper file ``storage/maria/Makefile.am'' storage/maria/cmakelists.txt: New BitKeeper file ``storage/maria/cmakelists.txt'' storage/maria/ft_maria.c: New BitKeeper file ``storage/maria/ft_maria.c'' storage/maria/ma_cache.c: New BitKeeper file ``storage/maria/ma_cache.c'' storage/maria/ma_changed.c: New BitKeeper file ``storage/maria/ma_changed.c'' storage/maria/ma_check.c: New BitKeeper file ``storage/maria/ma_check.c'' storage/maria/ma_checksum.c: New BitKeeper file ``storage/maria/ma_checksum.c'' storage/maria/ma_close.c: New BitKeeper file ``storage/maria/ma_close.c'' storage/maria/ma_create.c: New BitKeeper file ``storage/maria/ma_create.c'' storage/maria/ma_dbug.c: New BitKeeper file ``storage/maria/ma_dbug.c'' storage/maria/ma_delete.c: New BitKeeper file ``storage/maria/ma_delete.c'' storage/maria/ma_delete_all.c: New BitKeeper file ``storage/maria/ma_delete_all.c'' storage/maria/ma_delete_table.c: New BitKeeper file ``storage/maria/ma_delete_table.c'' storage/maria/ma_dynrec.c: New BitKeeper file ``storage/maria/ma_dynrec.c'' storage/maria/ma_extra.c: New BitKeeper file ``storage/maria/ma_extra.c'' storage/maria/ma_ft_boolean_search.c: New BitKeeper file ``storage/maria/ma_ft_boolean_search.c'' storage/maria/ma_ft_eval.c: New BitKeeper file ``storage/maria/ma_ft_eval.c'' storage/maria/ma_ft_eval.h: New BitKeeper file ``storage/maria/ma_ft_eval.h'' storage/maria/ma_ft_nlq_search.c: New BitKeeper file ``storage/maria/ma_ft_nlq_search.c'' storage/maria/ma_ft_parser.c: New BitKeeper file ``storage/maria/ma_ft_parser.c'' storage/maria/ma_ft_stem.c: New BitKeeper file ``storage/maria/ma_ft_stem.c'' storage/maria/ma_ft_test1.c: New BitKeeper file ``storage/maria/ma_ft_test1.c'' storage/maria/ma_ft_test1.h: New BitKeeper file ``storage/maria/ma_ft_test1.h'' storage/maria/ma_ft_update.c: New BitKeeper file ``storage/maria/ma_ft_update.c'' storage/maria/ma_ftdefs.h: New BitKeeper file ``storage/maria/ma_ftdefs.h'' storage/maria/ma_fulltext.h: New BitKeeper file ``storage/maria/ma_fulltext.h'' storage/maria/ma_info.c: New BitKeeper file ``storage/maria/ma_info.c'' storage/maria/ma_init.c: New BitKeeper file ``storage/maria/ma_init.c'' storage/maria/ma_key.c: New BitKeeper file ``storage/maria/ma_key.c'' storage/maria/ma_keycache.c: New BitKeeper file ``storage/maria/ma_keycache.c'' storage/maria/ma_locking.c: New BitKeeper file ``storage/maria/ma_locking.c'' storage/maria/ma_log.c: New BitKeeper file ``storage/maria/ma_log.c'' storage/maria/ma_open.c: New BitKeeper file ``storage/maria/ma_open.c'' storage/maria/ma_packrec.c: New BitKeeper file ``storage/maria/ma_packrec.c'' storage/maria/ma_page.c: New BitKeeper file ``storage/maria/ma_page.c'' storage/maria/ma_panic.c: New BitKeeper file ``storage/maria/ma_panic.c'' storage/maria/ma_preload.c: New BitKeeper file ``storage/maria/ma_preload.c'' storage/maria/ma_range.c: New BitKeeper file ``storage/maria/ma_range.c'' storage/maria/ma_rename.c: New BitKeeper file ``storage/maria/ma_rename.c'' storage/maria/ma_rfirst.c: New BitKeeper file ``storage/maria/ma_rfirst.c'' storage/maria/ma_rkey.c: New BitKeeper file ``storage/maria/ma_rkey.c'' storage/maria/ma_rlast.c: New BitKeeper file ``storage/maria/ma_rlast.c'' storage/maria/ma_rnext.c: New BitKeeper file ``storage/maria/ma_rnext.c'' storage/maria/ma_rnext_same.c: New BitKeeper file ``storage/maria/ma_rnext_same.c'' storage/maria/ma_rprev.c: New BitKeeper file ``storage/maria/ma_rprev.c'' storage/maria/ma_rrnd.c: New BitKeeper file ``storage/maria/ma_rrnd.c'' storage/maria/ma_rsame.c: New BitKeeper file ``storage/maria/ma_rsame.c'' storage/maria/ma_rsamepos.c: New BitKeeper file ``storage/maria/ma_rsamepos.c'' storage/maria/ma_rt_index.c: New BitKeeper file ``storage/maria/ma_rt_index.c'' storage/maria/ma_rt_index.h: New BitKeeper file ``storage/maria/ma_rt_index.h'' storage/maria/ma_rt_key.c: New BitKeeper file ``storage/maria/ma_rt_key.c'' storage/maria/ma_rt_key.h: New BitKeeper file ``storage/maria/ma_rt_key.h'' storage/maria/ma_rt_mbr.c: New BitKeeper file ``storage/maria/ma_rt_mbr.c'' storage/maria/ma_rt_mbr.h: New BitKeeper file ``storage/maria/ma_rt_mbr.h'' storage/maria/ma_rt_split.c: New BitKeeper file ``storage/maria/ma_rt_split.c'' storage/maria/ma_rt_test.c: New BitKeeper file ``storage/maria/ma_rt_test.c'' storage/maria/ma_scan.c: New BitKeeper file ``storage/maria/ma_scan.c'' storage/maria/ma_search.c: New BitKeeper file ``storage/maria/ma_search.c'' storage/maria/ma_sort.c: New BitKeeper file ``storage/maria/ma_sort.c'' storage/maria/ma_sp_defs.h: New BitKeeper file ``storage/maria/ma_sp_defs.h'' storage/maria/ma_sp_key.c: New BitKeeper file ``storage/maria/ma_sp_key.c'' storage/maria/ma_sp_test.c: New BitKeeper file ``storage/maria/ma_sp_test.c'' storage/maria/ma_static.c: New BitKeeper file ``storage/maria/ma_static.c'' storage/maria/ma_statrec.c: New BitKeeper file ``storage/maria/ma_statrec.c'' storage/maria/ma_test1.c: New BitKeeper file ``storage/maria/ma_test1.c'' storage/maria/ma_test2.c: New BitKeeper file ``storage/maria/ma_test2.c'' storage/maria/ma_test3.c: New BitKeeper file ``storage/maria/ma_test3.c'' storage/maria/ma_test_all.sh: New BitKeeper file ``storage/maria/ma_test_all.sh'' storage/maria/ma_unique.c: New BitKeeper file ``storage/maria/ma_unique.c'' storage/maria/ma_update.c: New BitKeeper file ``storage/maria/ma_update.c'' storage/maria/ma_write.c: New BitKeeper file ``storage/maria/ma_write.c'' storage/maria/maria_chk.c: New BitKeeper file ``storage/maria/maria_chk.c'' storage/maria/maria_def.h: New BitKeeper file ``storage/maria/maria_def.h'' storage/maria/maria_ftdump.c: New BitKeeper file ``storage/maria/maria_ftdump.c'' storage/maria/maria_log.c: New BitKeeper file ``storage/maria/maria_log.c'' storage/maria/maria_pack.c: New BitKeeper file ``storage/maria/maria_pack.c'' storage/maria/maria_rename.sh: New BitKeeper file ``storage/maria/maria_rename.sh'' storage/maria/test_pack: New BitKeeper file ``storage/maria/test_pack'' storage/myisam/ft_myisam.c: New BitKeeper file ``storage/myisam/ft_myisam.c''
301 lines
8.8 KiB
C
301 lines
8.8 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; 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 */
|
|
|
|
/* Functions to handle fixed-length-records */
|
|
|
|
#include "maria_def.h"
|
|
|
|
|
|
int _ma_write_static_record(MARIA_HA *info, const byte *record)
|
|
{
|
|
uchar temp[8]; /* max pointer length */
|
|
if (info->s->state.dellink != HA_OFFSET_ERROR &&
|
|
!info->append_insert_at_end)
|
|
{
|
|
my_off_t filepos=info->s->state.dellink;
|
|
info->rec_cache.seek_not_done=1; /* We have done a seek */
|
|
if (info->s->file_read(info,(char*) &temp[0],info->s->base.rec_reflength,
|
|
info->s->state.dellink+1,
|
|
MYF(MY_NABP)))
|
|
goto err;
|
|
info->s->state.dellink= _ma_rec_pos(info->s,temp);
|
|
info->state->del--;
|
|
info->state->empty-=info->s->base.pack_reclength;
|
|
if (info->s->file_write(info, (char*) record, info->s->base.reclength,
|
|
filepos,
|
|
MYF(MY_NABP)))
|
|
goto err;
|
|
}
|
|
else
|
|
{
|
|
if (info->state->data_file_length > info->s->base.max_data_file_length-
|
|
info->s->base.pack_reclength)
|
|
{
|
|
my_errno=HA_ERR_RECORD_FILE_FULL;
|
|
return(2);
|
|
}
|
|
if (info->opt_flag & WRITE_CACHE_USED)
|
|
{ /* Cash in use */
|
|
if (my_b_write(&info->rec_cache, (byte*) record,
|
|
info->s->base.reclength))
|
|
goto err;
|
|
if (info->s->base.pack_reclength != info->s->base.reclength)
|
|
{
|
|
uint length=info->s->base.pack_reclength - info->s->base.reclength;
|
|
bzero((char*) temp,length);
|
|
if (my_b_write(&info->rec_cache, (byte*) temp,length))
|
|
goto err;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
info->rec_cache.seek_not_done=1; /* We have done a seek */
|
|
if (info->s->file_write(info,(char*) record,info->s->base.reclength,
|
|
info->state->data_file_length,
|
|
info->s->write_flag))
|
|
goto err;
|
|
if (info->s->base.pack_reclength != info->s->base.reclength)
|
|
{
|
|
uint length=info->s->base.pack_reclength - info->s->base.reclength;
|
|
bzero((char*) temp,length);
|
|
if (info->s->file_write(info, (byte*) temp,length,
|
|
info->state->data_file_length+
|
|
info->s->base.reclength,
|
|
info->s->write_flag))
|
|
goto err;
|
|
}
|
|
}
|
|
info->state->data_file_length+=info->s->base.pack_reclength;
|
|
info->s->state.split++;
|
|
}
|
|
return 0;
|
|
err:
|
|
return 1;
|
|
}
|
|
|
|
int _ma_update_static_record(MARIA_HA *info, my_off_t pos, const byte *record)
|
|
{
|
|
info->rec_cache.seek_not_done=1; /* We have done a seek */
|
|
return (info->s->file_write(info,
|
|
(char*) record,info->s->base.reclength,
|
|
pos,
|
|
MYF(MY_NABP)) != 0);
|
|
}
|
|
|
|
|
|
int _ma_delete_static_record(MARIA_HA *info)
|
|
{
|
|
uchar temp[9]; /* 1+sizeof(uint32) */
|
|
|
|
info->state->del++;
|
|
info->state->empty+=info->s->base.pack_reclength;
|
|
temp[0]= '\0'; /* Mark that record is deleted */
|
|
_ma_dpointer(info,temp+1,info->s->state.dellink);
|
|
info->s->state.dellink = info->lastpos;
|
|
info->rec_cache.seek_not_done=1;
|
|
return (info->s->file_write(info,(byte*) temp, 1+info->s->rec_reflength,
|
|
info->lastpos, MYF(MY_NABP)) != 0);
|
|
}
|
|
|
|
|
|
int _ma_cmp_static_record(register MARIA_HA *info, register const byte *old)
|
|
{
|
|
DBUG_ENTER("_ma_cmp_static_record");
|
|
|
|
/* We are going to do changes; dont let anybody disturb */
|
|
dont_break(); /* Dont allow SIGHUP or SIGINT */
|
|
|
|
if (info->opt_flag & WRITE_CACHE_USED)
|
|
{
|
|
if (flush_io_cache(&info->rec_cache))
|
|
{
|
|
DBUG_RETURN(-1);
|
|
}
|
|
info->rec_cache.seek_not_done=1; /* We have done a seek */
|
|
}
|
|
|
|
if ((info->opt_flag & READ_CHECK_USED))
|
|
{ /* If check isn't disabled */
|
|
info->rec_cache.seek_not_done=1; /* We have done a seek */
|
|
if (info->s->file_read(info, (char*) info->rec_buff, info->s->base.reclength,
|
|
info->lastpos,
|
|
MYF(MY_NABP)))
|
|
DBUG_RETURN(-1);
|
|
if (memcmp((byte*) info->rec_buff, (byte*) old,
|
|
(uint) info->s->base.reclength))
|
|
{
|
|
DBUG_DUMP("read",old,info->s->base.reclength);
|
|
DBUG_DUMP("disk",info->rec_buff,info->s->base.reclength);
|
|
my_errno=HA_ERR_RECORD_CHANGED; /* Record have changed */
|
|
DBUG_RETURN(1);
|
|
}
|
|
}
|
|
DBUG_RETURN(0);
|
|
}
|
|
|
|
|
|
int _ma_cmp_static_unique(MARIA_HA *info, MARIA_UNIQUEDEF *def,
|
|
const byte *record, my_off_t pos)
|
|
{
|
|
DBUG_ENTER("_ma_cmp_static_unique");
|
|
|
|
info->rec_cache.seek_not_done=1; /* We have done a seek */
|
|
if (info->s->file_read(info, (char*) info->rec_buff, info->s->base.reclength,
|
|
pos, MYF(MY_NABP)))
|
|
DBUG_RETURN(-1);
|
|
DBUG_RETURN(_ma_unique_comp(def, record, info->rec_buff,
|
|
def->null_are_equal));
|
|
}
|
|
|
|
|
|
/* Read a fixed-length-record */
|
|
/* Returns 0 if Ok. */
|
|
/* 1 if record is deleted */
|
|
/* MY_FILE_ERROR on read-error or locking-error */
|
|
|
|
int _ma_read_static_record(register MARIA_HA *info, register my_off_t pos,
|
|
register byte *record)
|
|
{
|
|
int error;
|
|
|
|
if (pos != HA_OFFSET_ERROR)
|
|
{
|
|
if (info->opt_flag & WRITE_CACHE_USED &&
|
|
info->rec_cache.pos_in_file <= pos &&
|
|
flush_io_cache(&info->rec_cache))
|
|
return(-1);
|
|
info->rec_cache.seek_not_done=1; /* We have done a seek */
|
|
|
|
error=info->s->file_read(info,(char*) record,info->s->base.reclength,
|
|
pos,MYF(MY_NABP)) != 0;
|
|
fast_ma_writeinfo(info);
|
|
if (! error)
|
|
{
|
|
if (!*record)
|
|
{
|
|
my_errno=HA_ERR_RECORD_DELETED;
|
|
return(1); /* Record is deleted */
|
|
}
|
|
info->update|= HA_STATE_AKTIV; /* Record is read */
|
|
return(0);
|
|
}
|
|
return(-1); /* Error on read */
|
|
}
|
|
fast_ma_writeinfo(info); /* No such record */
|
|
return(-1);
|
|
}
|
|
|
|
|
|
|
|
int _ma_read_rnd_static_record(MARIA_HA *info, byte *buf,
|
|
register my_off_t filepos,
|
|
my_bool skip_deleted_blocks)
|
|
{
|
|
int locked,error,cache_read;
|
|
uint cache_length;
|
|
MARIA_SHARE *share=info->s;
|
|
DBUG_ENTER("_ma_read_rnd_static_record");
|
|
|
|
cache_read=0;
|
|
cache_length=0;
|
|
if (info->opt_flag & WRITE_CACHE_USED &&
|
|
(info->rec_cache.pos_in_file <= filepos || skip_deleted_blocks) &&
|
|
flush_io_cache(&info->rec_cache))
|
|
DBUG_RETURN(my_errno);
|
|
if (info->opt_flag & READ_CACHE_USED)
|
|
{ /* Cache in use */
|
|
if (filepos == my_b_tell(&info->rec_cache) &&
|
|
(skip_deleted_blocks || !filepos))
|
|
{
|
|
cache_read=1; /* Read record using cache */
|
|
cache_length=(uint) (info->rec_cache.read_end - info->rec_cache.read_pos);
|
|
}
|
|
else
|
|
info->rec_cache.seek_not_done=1; /* Filepos is changed */
|
|
}
|
|
locked=0;
|
|
if (info->lock_type == F_UNLCK)
|
|
{
|
|
if (filepos >= info->state->data_file_length)
|
|
{ /* Test if new records */
|
|
if (_ma_readinfo(info,F_RDLCK,0))
|
|
DBUG_RETURN(my_errno);
|
|
locked=1;
|
|
}
|
|
else
|
|
{ /* We don't nead new info */
|
|
#ifndef UNSAFE_LOCKING
|
|
if ((! cache_read || share->base.reclength > cache_length) &&
|
|
share->tot_locks == 0)
|
|
{ /* record not in cache */
|
|
if (my_lock(share->kfile,F_RDLCK,0L,F_TO_EOF,
|
|
MYF(MY_SEEK_NOT_DONE) | info->lock_wait))
|
|
DBUG_RETURN(my_errno);
|
|
locked=1;
|
|
}
|
|
#else
|
|
info->tmp_lock_type=F_RDLCK;
|
|
#endif
|
|
}
|
|
}
|
|
if (filepos >= info->state->data_file_length)
|
|
{
|
|
DBUG_PRINT("test",("filepos: %ld (%ld) records: %ld del: %ld",
|
|
filepos/share->base.reclength,filepos,
|
|
info->state->records, info->state->del));
|
|
fast_ma_writeinfo(info);
|
|
DBUG_RETURN(my_errno=HA_ERR_END_OF_FILE);
|
|
}
|
|
info->lastpos= filepos;
|
|
info->nextpos= filepos+share->base.pack_reclength;
|
|
|
|
if (! cache_read) /* No cacheing */
|
|
{
|
|
if ((error= _ma_read_static_record(info,filepos,buf)))
|
|
{
|
|
if (error > 0)
|
|
error=my_errno=HA_ERR_RECORD_DELETED;
|
|
else
|
|
error=my_errno;
|
|
}
|
|
DBUG_RETURN(error);
|
|
}
|
|
|
|
/* Read record with cacheing */
|
|
error=my_b_read(&info->rec_cache,(byte*) buf,share->base.reclength);
|
|
if (info->s->base.pack_reclength != info->s->base.reclength && !error)
|
|
{
|
|
char tmp[8]; /* Skill fill bytes */
|
|
error=my_b_read(&info->rec_cache,(byte*) tmp,
|
|
info->s->base.pack_reclength - info->s->base.reclength);
|
|
}
|
|
if (locked)
|
|
VOID(_ma_writeinfo(info,0)); /* Unlock keyfile */
|
|
if (!error)
|
|
{
|
|
if (!buf[0])
|
|
{ /* Record is removed */
|
|
DBUG_RETURN(my_errno=HA_ERR_RECORD_DELETED);
|
|
}
|
|
/* Found and may be updated */
|
|
info->update|= HA_STATE_AKTIV | HA_STATE_KEY_CHANGED;
|
|
DBUG_RETURN(0);
|
|
}
|
|
/* my_errno should be set if rec_cache.error == -1 */
|
|
if (info->rec_cache.error != -1 || my_errno == 0)
|
|
my_errno=HA_ERR_WRONG_IN_RECORD;
|
|
DBUG_RETURN(my_errno); /* Something wrong (EOF?) */
|
|
}
|