Fixed compilation warnings (while testing 32 bit builds)

6 files changed, 9 insertions, 9 deletions

diff --git a/storage/connect/fmdlex.c b/storage/connect/fmdlex.c
index 548a7ae5b7e..ef4f7bfc65a 100644
--- a/storage/connect/fmdlex.c
+++ b/storage/connect/fmdlex.c
@@ -529,7 +529,7 @@ YY_DECL
   pp->Num = 0;
   if (pp->InFmt) {*pp->InFmt = '\0'; pp->InFmt[pp->Outsize -1] = '\0'; }
   if (pp->OutFmt) {*pp->OutFmt = '\0'; pp->OutFmt[pp->Outsize -1] = '\0'; }
-  pp->Curp = pp->Format;
+  pp->Curp = (char*) pp->Format;
   yy_init = 1;   /* This is a new input */
 
 
diff --git a/storage/connect/tabmysql.cpp b/storage/connect/tabmysql.cpp
index bdddcf64ca8..97ff7bc59f2 100644
--- a/storage/connect/tabmysql.cpp
+++ b/storage/connect/tabmysql.cpp
@@ -124,7 +124,7 @@ bool MYSQLDEF::GetServerInfo(PGLOBAL g, const char *server_name)
     DBUG_RETURN(true);
     } // endif server
 
-  DBUG_PRINT("info", ("get_server_by_name returned server at %lx",
+  DBUG_PRINT("info", ("get_server_by_name returned server at %zx",
                       (size_t) server));
 
   // TODO: We need to examine which of these can really be NULL
diff --git a/storage/maria/ma_test2.c b/storage/maria/ma_test2.c
index 6dfa04a5217..24c48c67210 100644
--- a/storage/maria/ma_test2.c
+++ b/storage/maria/ma_test2.c
@@ -1006,8 +1006,8 @@ w_requests: %10lu\n\
 writes:     %10lu\n\
 r_requests: %10lu\n\
 reads:      %10lu\n",
-           maria_pagecache->blocks_used,
-           maria_pagecache->global_blocks_changed,
+           (ulong) maria_pagecache->blocks_used,
+           (ulong) maria_pagecache->global_blocks_changed,
            (ulong) maria_pagecache->global_cache_w_requests,
            (ulong) maria_pagecache->global_cache_write,
            (ulong) maria_pagecache->global_cache_r_requests,
diff --git a/storage/tokudb/PerconaFT/ft/loader/dbufio.cc b/storage/tokudb/PerconaFT/ft/loader/dbufio.cc
index 64722bd68f1..ad084a4fbdc 100644
--- a/storage/tokudb/PerconaFT/ft/loader/dbufio.cc
+++ b/storage/tokudb/PerconaFT/ft/loader/dbufio.cc
@@ -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])
diff --git a/storage/tokudb/PerconaFT/ft/serialize/ft_node-serialize.cc b/storage/tokudb/PerconaFT/ft/serialize/ft_node-serialize.cc
index 56876b474d4..9606db64632 100644
--- a/storage/tokudb/PerconaFT/ft/serialize/ft_node-serialize.cc
+++ b/storage/tokudb/PerconaFT/ft/serialize/ft_node-serialize.cc
@@ -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;
     }
diff --git a/storage/tokudb/PerconaFT/ft/txn/txn_manager.cc b/storage/tokudb/PerconaFT/ft/txn/txn_manager.cc
index 88eca36a261..8fe52b10597 100644
--- a/storage/tokudb/PerconaFT/ft/txn/txn_manager.cc
+++ b/storage/tokudb/PerconaFT/ft/txn/txn_manager.cc
@@ -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: