diff options
author | monty@mysql.com <> | 2003-12-20 03:41:04 +0200 |
---|---|---|
committer | monty@mysql.com <> | 2003-12-20 03:41:04 +0200 |
commit | 0448a3f4c01fdbc1d3ae0c26dddba7874b652394 (patch) | |
tree | 7b73c477120c02f912fc4e2d5105e727385d6bc6 /innobase/mtr | |
parent | 4b3e443b3637446ef5933fd705e92a1d198c6568 (diff) | |
download | mariadb-git-0448a3f4c01fdbc1d3ae0c26dddba7874b652394.tar.gz |
Add cast of integer/longlong to (ulong) to make printf/sprintf 64 bit safe
A after merge fix for last merge
Diffstat (limited to 'innobase/mtr')
-rw-r--r-- | innobase/mtr/mtr0log.c | 8 | ||||
-rw-r--r-- | innobase/mtr/mtr0mtr.c | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/innobase/mtr/mtr0log.c b/innobase/mtr/mtr0log.c index 898778dda53..4b5d7e61de6 100644 --- a/innobase/mtr/mtr0log.c +++ b/innobase/mtr/mtr0log.c @@ -58,7 +58,7 @@ mlog_write_initial_log_record( if (ptr < buf_pool->frame_zero || ptr >= buf_pool->high_end) { fprintf(stderr, "InnoDB: Error: trying to write to a stray memory location %lx\n", - (ulint)ptr); + (ulong) ptr); ut_a(0); } @@ -221,7 +221,7 @@ mlog_write_ulint( if (ptr < buf_pool->frame_zero || ptr >= buf_pool->high_end) { fprintf(stderr, "InnoDB: Error: trying to write to a stray memory location %lx\n", - (ulint)ptr); + (ulong) ptr); ut_a(0); } @@ -269,7 +269,7 @@ mlog_write_dulint( if (ptr < buf_pool->frame_zero || ptr >= buf_pool->high_end) { fprintf(stderr, "InnoDB: Error: trying to write to a stray memory location %lx\n", - (ulint)ptr); + (ulong) ptr); ut_a(0); } @@ -313,7 +313,7 @@ mlog_write_string( if (ptr < buf_pool->frame_zero || ptr >= buf_pool->high_end) { fprintf(stderr, "InnoDB: Error: trying to write to a stray memory location %lx\n", - (ulint)ptr); + (ulong) ptr); ut_a(0); } ut_ad(ptr && mtr); diff --git a/innobase/mtr/mtr0mtr.c b/innobase/mtr/mtr0mtr.c index e9a6e39d98f..63ce491523b 100644 --- a/innobase/mtr/mtr0mtr.c +++ b/innobase/mtr/mtr0mtr.c @@ -263,11 +263,11 @@ mtr_first_to_modify_page_after_backup( backup_lsn) <= 0) { printf("Page %lu newest %lu backup %lu\n", - block->offset, - ut_dulint_get_low( + (ulong) block->offset, + (ulong) ut_dulint_get_low( buf_frame_get_newest_modification( block->frame)), - ut_dulint_get_low(backup_lsn)); + (ulong) ut_dulint_get_low(backup_lsn)); ret = TRUE; } @@ -519,6 +519,6 @@ mtr_print( { printf( "Mini-transaction handle: memo size %lu bytes log size %lu bytes\n", - dyn_array_get_data_size(&(mtr->memo)), - dyn_array_get_data_size(&(mtr->log))); + (ulong) dyn_array_get_data_size(&(mtr->memo)), + (ulong) dyn_array_get_data_size(&(mtr->log))); } |