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/xtradb/buf | |
| 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/xtradb/buf')
| -rw-r--r-- | storage/xtradb/buf/buf0buf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/storage/xtradb/buf/buf0buf.c b/storage/xtradb/buf/buf0buf.c index 617b0e01b09..2ea17baf34a 100644 --- a/storage/xtradb/buf/buf0buf.c +++ b/storage/xtradb/buf/buf0buf.c @@ -76,10 +76,10 @@ inline void _increment_page_get_statistics(buf_block_t* block, trx_t* trx) block->page.offset, DPAH_SIZE << 3); block_hash_byte = block_hash >> 3; block_hash_offset = (byte) block_hash & 0x07; - if (block_hash_byte < 0 || block_hash_byte >= DPAH_SIZE) - fprintf(stderr, "!!! block_hash_byte = %lu block_hash_offset = %lu !!!\n", block_hash_byte, block_hash_offset); - if (block_hash_offset < 0 || block_hash_offset > 7) - fprintf(stderr, "!!! block_hash_byte = %lu block_hash_offset = %lu !!!\n", block_hash_byte, block_hash_offset); + if (block_hash_byte >= DPAH_SIZE) + fprintf(stderr, "!!! block_hash_byte = %lu block_hash_offset = %lu !!!\n", (unsigned long) block_hash_byte, (unsigned long) block_hash_offset); + if (block_hash_offset > 7) + fprintf(stderr, "!!! block_hash_byte = %lu block_hash_offset = %lu !!!\n", (unsigned long) block_hash_byte, (unsigned long) block_hash_offset); if ((trx->distinct_page_access_hash[block_hash_byte] & ((byte) 0x01 << block_hash_offset)) == 0) trx->distinct_page_access++; trx->distinct_page_access_hash[block_hash_byte] |= (byte) 0x01 << block_hash_offset; |