mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 11:57:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fixed compilation warnings (while testing 32 bit builds)

Browse source
This commit is contained in:
Monty 2017-07-01 14:22:49 +03:00
commit 92f1837a27
7 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/tokudb/PerconaFT/ft/loader/dbufio.cc
View file

@ -566,7 +566,7 @@ dbufio_print(DBUFIO_FILESET bfs) {
fprintf(stderr, "%s:%d bfs=%p", __FILE__, __LINE__, bfs);
if (bfs->panic)
fprintf(stderr, " panic=%d", bfs->panic_errno);
fprintf(stderr, " N=%d %d %" PRIuMAX, bfs->N, bfs->n_not_done, bfs->bufsize);
fprintf(stderr, " N=%d %d %" PRIuMAX, bfs->N, bfs->n_not_done, (uintmax_t) bfs->bufsize);
for (int i = 0; i < bfs->N; i++) {
struct dbufio_file *dbf = &bfs->files[i];
if (dbf->error_code[0] || dbf->error_code[1])

4
storage/tokudb/PerconaFT/ft/serialize/ft_node-serialize.cc
View file

@ -761,7 +761,7 @@ int toku_serialize_ftnode_to_memory(FTNODE node,
// Zero the rest of the buffer
memset(data + total_node_size, 0, total_buffer_size - total_node_size);
assert(curr_ptr - data == total_node_size);
assert((uint32_t) (curr_ptr - data) == total_node_size);
*bytes_to_write = data;
*n_bytes_to_write = total_buffer_size;
*n_uncompressed_bytes = total_uncompressed_size;
@ -2699,7 +2699,7 @@ decompress_from_raw_block_into_rbuf(uint8_t *raw_block, size_t raw_block_size, s
// decompress all the compressed sub blocks into the uncompressed buffer
r = decompress_all_sub_blocks(n_sub_blocks, sub_block, compressed_data, uncompressed_data, num_cores, ft_pool);
if (r != 0) {
fprintf(stderr, "%s:%d block %" PRId64 " failed %d at %p size %lu\n", __FUNCTION__, __LINE__, blocknum.b, r, raw_block, raw_block_size);
fprintf(stderr, "%s:%d block %" PRId64 " failed %d at %p size %zu\n", __FUNCTION__, __LINE__, blocknum.b, r, raw_block, raw_block_size);
dump_bad_block(raw_block, raw_block_size);
goto exit;
}

4
storage/tokudb/PerconaFT/ft/txn/txn_manager.cc
View file

@ -970,11 +970,11 @@ int toku_txn_manager_recover_root_txn (
txn_manager->last_xid_seen_for_recover = curr_txn->txnid.parent_id64;
// if we found the maximum number of prepared transactions we are
// allowed to find, then break
if (num_txns_returned >= count) {
if ((long) num_txns_returned >= count) {
break;
}
}
invariant(num_txns_returned <= count);
invariant((long) num_txns_returned <= count);
*retp = num_txns_returned;
ret_val = 0;
exit: