mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 23:54:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

5.3->5.5 merge

Browse source
This commit is contained in:
Sergei Golubchik 2011-11-22 18:04:38 +01:00
commit d2755a2c9c
394 changed files with 17627 additions and 3353 deletions
Download patch file Download diff file Expand all files Collapse all files

9
storage/maria/ma_dynrec.c
View file

@ -1734,14 +1734,19 @@ int _ma_read_rnd_dynamic_record(MARIA_HA *info,
MARIA_RECORD_POS filepos,
my_bool skip_deleted_blocks)
{
int block_of_record, info_read;
int block_of_record;
#ifdef MARIA_EXTERNAL_LOCKING
int info_read;
#endif
uint left_len,b_type;
uchar *UNINIT_VAR(to);
MARIA_BLOCK_INFO block_info;
MARIA_SHARE *share= info->s;
DBUG_ENTER("_ma_read_rnd_dynamic_record");
#ifdef MARIA_EXTERNAL_LOCKING
info_read=0;
#endif
if (info->lock_type == F_UNLCK)
{
@ -1750,8 +1755,10 @@ int _ma_read_rnd_dynamic_record(MARIA_HA *info,
info->tmp_lock_type=F_RDLCK;
#endif
}
#ifdef MARIA_EXTERNAL_LOCKING
else
info_read=1; /* memory-keyinfoblock is ok */
#endif
block_of_record= 0; /* First block of record is numbered as zero. */
block_info.second_read= 0;