summaryrefslogtreecommitdiff
path: root/myisam/mi_dynrec.c
diff options
context:
space:
mode:
authorunknown <serg@sergbook.mysql.com>2002-07-14 21:47:46 +0200
committerunknown <serg@sergbook.mysql.com>2002-07-14 21:47:46 +0200
commitaf2d5f3df11d4bcf51f465e6732f40dba06dbd94 (patch)
treeb53b24f6e33023d7d8ec76bbad1101b24ec1c504 /myisam/mi_dynrec.c
parentd8093cf6ff17e146e33e91ba16f46992859a5cc9 (diff)
downloadmariadb-git-af2d5f3df11d4bcf51f465e6732f40dba06dbd94.tar.gz
parallel repair needs rec_buff local for thread !!!
mysys/mf_iocache.c: remove debug output
Diffstat (limited to 'myisam/mi_dynrec.c')
-rw-r--r--myisam/mi_dynrec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/myisam/mi_dynrec.c b/myisam/mi_dynrec.c
index cdff9d1339b..92c8e50690b 100644
--- a/myisam/mi_dynrec.c
+++ b/myisam/mi_dynrec.c
@@ -728,7 +728,7 @@ uint _mi_rec_pack(MI_INFO *info, register byte *to, register const byte *from)
Returns 0 if record is ok.
*/
-my_bool _mi_rec_check(MI_INFO *info,const char *record)
+my_bool _mi_rec_check(MI_INFO *info,const char *record, byte *rec_buff)
{
uint length,new_length,flag,bit,i;
char *pos,*end,*packpos,*to;
@@ -736,7 +736,7 @@ my_bool _mi_rec_check(MI_INFO *info,const char *record)
reg3 MI_COLUMNDEF *rec;
DBUG_ENTER("_mi_rec_check");
- packpos=info->rec_buff; to= info->rec_buff+info->s->base.pack_bits;
+ packpos=rec_buff; to= rec_buff+info->s->base.pack_bits;
rec=info->s->rec;
flag= *packpos; bit=1;
@@ -820,7 +820,7 @@ my_bool _mi_rec_check(MI_INFO *info,const char *record)
to+=length;
}
}
- if (info->packed_length != (uint) (to - info->rec_buff)
+ if (info->packed_length != (uint) (to - rec_buff)
+ test(info->s->calc_checksum) ||
(bit != 1 && (flag & ~(bit - 1))))
goto err;