From 65c44414c21c21ce7b57bd672873558ec2ed3031 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 20 Dec 2003 03:41:04 +0200 Subject: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe A after merge fix for last merge innobase/btr/btr0btr.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/btr/btr0sea.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/buf/buf0buf.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/buf/buf0flu.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/buf/buf0lru.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/buf/buf0rea.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/com/com0shm.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/data/data0data.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/data/data0type.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/dict/dict0crea.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/dict/dict0dict.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/fil/fil0fil.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/fsp/fsp0fsp.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/fut/fut0lst.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/ha/ha0ha.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/ibuf/ibuf0ibuf.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/include/univ.i: Disabled ut_sprintf/ut_fprintf. Not needed as all number arguments to printf are now casted innobase/lock/lock0lock.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/log/log0log.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/log/log0recv.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/mem/mem0dbg.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/mem/mem0pool.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/mtr/mtr0log.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/mtr/mtr0mtr.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/os/os0file.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/os/os0sync.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/page/page0cur.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/page/page0page.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/read/read0read.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/rem/rem0cmp.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/rem/rem0rec.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/row/row0mysql.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe Heikki, please check the change of % to %% innobase/row/row0sel.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/row/row0undo.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/srv/srv0srv.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/srv/srv0start.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/sync/sync0arr.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/sync/sync0rw.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/sync/sync0sync.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/trx/trx0purge.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/trx/trx0rec.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/trx/trx0roll.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/trx/trx0sys.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/trx/trx0trx.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/trx/trx0undo.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/usr/usr0sess.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/ut/ut0mem.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe innobase/ut/ut0ut.c: Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe sql/sql_delete.cc: After merge fix --- innobase/ibuf/ibuf0ibuf.c | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) (limited to 'innobase/ibuf') diff --git a/innobase/ibuf/ibuf0ibuf.c b/innobase/ibuf/ibuf0ibuf.c index 95982e57126..b4a28d5fcd8 100644 --- a/innobase/ibuf/ibuf0ibuf.c +++ b/innobase/ibuf/ibuf0ibuf.c @@ -509,7 +509,7 @@ ibuf_data_init_for_space( ibuf_exit(); - sprintf(buf, "SYS_IBUF_TABLE_%lu", space); + sprintf(buf, "SYS_IBUF_TABLE_%lu", (ulong) space); table = dict_mem_table_create(buf, space, 2); @@ -1694,7 +1694,7 @@ ibuf_free_excess_pages( if (space != 0) { fprintf(stderr, -"InnoDB: Error: calling ibuf_free_excess_pages for space %lu\n", space); +"InnoDB: Error: calling ibuf_free_excess_pages for space %lu\n", (ulong) space); return; } @@ -2714,8 +2714,8 @@ ibuf_insert_to_index_page( fprintf(stderr, "InnoDB: Error: Insert buffer insert fails; page free %lu, dtuple size %lu\n", - page_get_max_insert_size(page, 1), - rec_get_converted_size(entry)); + (ulong) page_get_max_insert_size(page, 1), + (ulong) rec_get_converted_size(entry)); dtuple_sprintf(errbuf, 900, entry); @@ -2733,7 +2733,7 @@ ibuf_insert_to_index_page( buf_frame_get_page_no(page), IBUF_BITMAP_FREE, mtr); - fprintf(stderr, "Bitmap bits %lu\n", old_bits); + fprintf(stderr, "Bitmap bits %lu\n", (ulong) old_bits); fprintf(stderr, "InnoDB: Send a detailed bug report to mysql@lists.mysql.com!\n"); @@ -2801,7 +2801,8 @@ ibuf_delete_rec( fprintf(stderr, "InnoDB: ERROR: Send the output to mysql@lists.mysql.com\n" "InnoDB: ibuf cursor restoration fails!\n" -"InnoDB: ibuf record inserted to space %lu page %lu\n", space, page_no); +"InnoDB: ibuf record inserted to space %lu page %lu\n", (ulong) space, + (ulong) page_no); fflush(stderr); rec_print(btr_pcur_get_rec(pcur)); @@ -2998,7 +2999,8 @@ ibuf_merge_or_delete_for_page( "InnoDB: to determine if they are corrupt after this.\n\n" "InnoDB: Please make a detailed bug report and send it to\n" "InnoDB: mysql@lists.mysql.com\n\n", - page_no, fil_page_get_type(page)); + (ulong) page_no, + (ulong) fil_page_get_type(page)); } } @@ -3237,7 +3239,8 @@ leave_loop: mutex_exit(&ibuf_mutex); - printf("Discarded %lu ibuf entries for space %lu\n", n_inserts, space); + printf("Discarded %lu ibuf entries for space %lu\n", (ulong) n_inserts, + (ulong) space); ibuf_exit(); @@ -3346,7 +3349,9 @@ ibuf_print( while (data) { buf += sprintf(buf, "Ibuf for space %lu: size %lu, free list len %lu, seg size %lu,", - data->space, data->size, data->free_list_len, data->seg_size); + (ulong) data->space, (ulong) data->size, + (ulong) data->free_list_len, + (ulong) data->seg_size); if (data->empty) { buf += sprintf(buf, " is empty\n"); @@ -3356,13 +3361,16 @@ ibuf_print( buf += sprintf(buf, "%lu inserts, %lu merged recs, %lu merges\n", - data->n_inserts, data->n_merged_recs, data->n_merges); + (ulong) data->n_inserts, + (ulong) data->n_merged_recs, + (ulong) data->n_merges); #ifdef UNIV_IBUF_DEBUG for (i = 0; i < IBUF_COUNT_N_PAGES; i++) { if (ibuf_count_get(data->space, i) > 0) { printf("Ibuf count for page %lu is %lu\n", - i, ibuf_count_get(data->space, i)); + (ulong) i, + (ulong) ibuf_count_get(data->space, i)); } } #endif -- cgit v1.2.1