database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-22 17:44:29 +03:00
Code Activity

Autmatic merge with 5.1

Browse Source
This commit is contained in:
Michael Widenius
2011-08-12 15:51:05 +03:00
parent b5ef802f8e 8b63d346a0
commit eeb04a339f
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
storage/maria/ma_bitmap.c
View File

@@ -907,7 +907,7 @@ void _ma_print_bitmap(MARIA_FILE_BITMAP *bitmap, uchar *data,
fprintf(DBUG_FILE,"\nDump of bitmap page at %s\n", llstr(page, llbuff)); fprintf(DBUG_FILE,"\nDump of bitmap page at %s\n", llstr(page, llbuff));
page++; /* Skip bitmap page */ page++; /* Skip bitmap page */
for (pos= data, end= pos + bitmap->total_size; for (pos= data, end= pos + bitmap->max_total_size;
pos < end ; pos < end ;
pos+= 6) pos+= 6)
{ {

16
storage/maria/ma_check.c
View File

@@ -1983,14 +1983,22 @@ static int check_block_record(HA_CHECK *param, MARIA_HA *info, int extend,
{ {
/* Not at end of bitmap */ /* Not at end of bitmap */
uint bitmap_pattern; uint bitmap_pattern;
uint byte_offset;
offset_page= (uint) ((page % share->bitmap.pages_covered) -1) * 3; offset_page= (uint) ((page % share->bitmap.pages_covered) -1) * 3;
offset= offset_page & 7; offset= offset_page & 7;
data= bitmap_buff + offset_page / 8; byte_offset= offset_page / 8;
data= bitmap_buff + byte_offset;
bitmap_pattern= uint2korr(data); bitmap_pattern= uint2korr(data);
if (byte_offset + 1 == share->bitmap.max_total_size)
{
/* On last byte of bitmap; Remove possible checksum */
bitmap_pattern&= 0xff;
}
if (((bitmap_pattern >> offset)) || if (((bitmap_pattern >> offset)) ||
(data + 2 < bitmap_buff + share->bitmap.max_total_size && (byte_offset + 2 < share->bitmap.max_total_size &&
_ma_check_if_zero(data+2, bitmap_buff + share->bitmap.max_total_size - _ma_check_if_zero(data+2, share->bitmap.max_total_size -
data - 2))) byte_offset - 2)))
{ {
ulonglong bitmap_page; ulonglong bitmap_page;
bitmap_page= page / share->bitmap.pages_covered; bitmap_page= page / share->bitmap.pages_covered;