diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-01-28 13:35:10 +0200 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-01-28 13:35:10 +0200 |
| commit | e926af9bf8d2b00c2c31a3741f65e3d5b846dffe (patch) | |
| tree | f3910ce9605223eeb0ad603d4b7d221f4b640ce7 /storage/maria/ma_blockrec.c | |
| parent | ef0416c14c6a6ba950990c73dd46d8e13f03ad03 (diff) | |
| parent | e2efd9338574c87177e0c00273e6e49a32ce2aa6 (diff) | |
| download | mariadb-git-e926af9bf8d2b00c2c31a3741f65e3d5b846dffe.tar.gz | |
Merge with fixes for compiler warnings and 2 fixed test cases
Fixed some additional compiler warnings from OpenSolaris build.
extra/libevent/devpoll.c:
Fixed compiler warning
mysys/my_file.c:
Fixed compiler warning
sql/mysqld.cc:
Fixed compiler warning
sql/rpl_record.cc:
Removed not used variable
storage/maria/ma_blockrec.c:
Fixed compiler warning
storage/xtradb/buf/buf0buf.c:
Fixed compiler warning
storage/xtradb/handler/i_s.cc:
Fixed compiler warning
support-files/compiler_warnings.supp:
Added suppression of compiler warnings in InnoDB/XtraDB
Added suppression of compiler warnings that can safely be ignored.
Diffstat (limited to 'storage/maria/ma_blockrec.c')
| -rw-r--r-- | storage/maria/ma_blockrec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/storage/maria/ma_blockrec.c b/storage/maria/ma_blockrec.c index e4e43bcfcfe..9097731c227 100644 --- a/storage/maria/ma_blockrec.c +++ b/storage/maria/ma_blockrec.c @@ -1688,7 +1688,8 @@ static my_bool get_head_or_tail_page(MARIA_HA *info, if (!page_link.changed) goto crashed; - DBUG_ASSERT((res->buff[PAGE_TYPE_OFFSET] & PAGE_TYPE_MASK) == page_type); + DBUG_ASSERT((uint) (res->buff[PAGE_TYPE_OFFSET] & PAGE_TYPE_MASK) == + page_type); if (!(dir= find_free_position(page_type == HEAD_PAGE ? info : 0, res->buff, block_size, &res->rownr, &res->length, &res->empty_space))) |