mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
a8d94b4ab3
Fixed bug when doing rnd_read followed by update. Don't duplicate error messages in log Initialize transaction object properly. Fixed failure in event*tests when running with maria mysql-test/mysql-test-run.pl: Removed warning when running with --external mysql-test/r/maria.result: Added back disabled test Verified that the result changes are correct mysql-test/t/maria.test: Added back disabled test sql/handler.cc: More debugging. Simple style change sql/sql_class.cc: Initialize transaction object properly. Fixed failure in event*tests when running with maria storage/maria/ha_maria.cc: More dbug info storage/maria/ma_blockrec.c: Removed not needed line storage/maria/ma_rrnd.c: Removed not used code Ensure that cur_row.lastpos is always set when reading record with rnd. (Fixes failure in maria.test) storage/maria/maria_def.h: Don't call maria_print_error() except with EXTRA_DEBUG (Removes duplicate error messages when somethings goes wrong)
44 lines
1.5 KiB
C
44 lines
1.5 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 */
|
|
|
|
/* Read a record with random-access. The position to the record must
|
|
get by MARIA_HA. The next record can be read with pos= MARIA_POS_ERROR */
|
|
|
|
|
|
#include "maria_def.h"
|
|
|
|
/*
|
|
Read a row based on position.
|
|
|
|
RETURN
|
|
0 Ok.
|
|
HA_ERR_RECORD_DELETED Record is deleted.
|
|
HA_ERR_END_OF_FILE EOF.
|
|
*/
|
|
|
|
int maria_rrnd(MARIA_HA *info, uchar *buf, MARIA_RECORD_POS filepos)
|
|
{
|
|
DBUG_ENTER("maria_rrnd");
|
|
|
|
DBUG_ASSERT(filepos != HA_OFFSET_ERROR);
|
|
|
|
/* Init all but update-flag */
|
|
info->update&= (HA_STATE_CHANGED | HA_STATE_ROW_CHANGED);
|
|
if (info->opt_flag & WRITE_CACHE_USED && flush_io_cache(&info->rec_cache))
|
|
DBUG_RETURN(my_errno);
|
|
|
|
info->cur_row.lastpos= filepos; /* Remember for update */
|
|
DBUG_RETURN((*info->s->read_record)(info, buf, filepos));
|
|
}
|