diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-10-20 01:33:12 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-10-20 01:33:12 +0300 |
| commit | 301ee8d9a37eebcced4d6e44ac669200731c9f75 (patch) | |
| tree | 065cc5f84dd28f31db7f48793402cc17d0b2ae27 /storage/maria/ma_bitmap.c | |
| parent | 13d53bf657060acaecf055107e5e6cc7045f351e (diff) | |
| parent | 1cede43268dec2baa2d80cff591da517d6500f74 (diff) | |
| download | mariadb-git-301ee8d9a37eebcced4d6e44ac669200731c9f75.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-maria
into mysql.com:/home/my/mysql-maria
include/my_sys.h:
Auto merged
mysql-test/r/maria.result:
Auto merged
mysql-test/t/maria.test:
Auto merged
sql/handler.h:
Auto merged
sql/mysqld.cc:
Auto merged
storage/maria/ha_maria.cc:
Auto merged
storage/maria/ma_bitmap.c:
Auto merged
storage/maria/ma_blockrec.c:
Auto merged
storage/maria/ma_loghandler.c:
Auto merged
storage/maria/ma_pagecache.c:
Auto merged
storage/maria/ma_test1.c:
Auto merged
storage/maria/ma_test_recovery.expected:
Auto merged
storage/maria/ma_test_recovery:
Auto merged
sql/mysql_priv.h:
manual merge
storage/maria/ma_recovery.c:
manual merge
storage/maria/ma_test2.c:
manual merge
Diffstat (limited to 'storage/maria/ma_bitmap.c')
| -rw-r--r-- | storage/maria/ma_bitmap.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/storage/maria/ma_bitmap.c b/storage/maria/ma_bitmap.c index 261ca1a50e7..fa2b32395b1 100644 --- a/storage/maria/ma_bitmap.c +++ b/storage/maria/ma_bitmap.c @@ -1231,6 +1231,7 @@ static my_bool find_blob(MARIA_HA *info, ulong length) MARIA_BITMAP_BLOCK *first_block= 0; DBUG_ENTER("find_blob"); DBUG_PRINT("enter", ("length: %lu", length)); + LINT_INIT(first_block_pos); pages= length / full_page_size; rest_length= (uint) (length - pages * full_page_size); @@ -2141,6 +2142,9 @@ my_bool _ma_check_bitmap_data(MARIA_HA *info, case BLOB_PAGE: bits= FULL_TAIL_PAGE; break; + default: + bits= 0; /* to satisfy compiler */ + DBUG_ASSERT(0); } return (*bitmap_pattern= get_page_bits(info, &info->s->bitmap, page)) != bits; |