diff options
Diffstat (limited to 'innobase/ut')
| -rw-r--r-- | innobase/ut/ut0mem.c | 14 | ||||
| -rw-r--r-- | innobase/ut/ut0ut.c | 10 |
2 files changed, 13 insertions, 11 deletions
diff --git a/innobase/ut/ut0mem.c b/innobase/ut/ut0mem.c index ebead6424c8..c367ea10ee1 100644 --- a/innobase/ut/ut0mem.c +++ b/innobase/ut/ut0mem.c @@ -89,11 +89,11 @@ ut_malloc_low( "InnoDB: a big enough maximum process size.\n" "InnoDB: We now intentionally generate a seg fault so that\n" "InnoDB: on Linux we get a stack trace.\n", - n, ut_total_allocated_memory, + (ulong) n, (ulong) ut_total_allocated_memory, #ifdef __WIN__ - (ulint)GetLastError() + (ulong) GetLastError() #else - (ulint)errno + (ulong) errno #endif ); @@ -107,7 +107,7 @@ ut_malloc_low( /* Make an intentional seg fault so that we get a stack trace */ - printf("%lu\n", *ut_mem_null_ptr); + printf("%lu\n", (ulong) *ut_mem_null_ptr); } if (set_to_zero) { @@ -166,7 +166,9 @@ ut_test_malloc( "InnoDB: ulimits of your operating system.\n" "InnoDB: On FreeBSD check you have compiled the OS with\n" "InnoDB: a big enough maximum process size.\n", - n, ut_total_allocated_memory, errno); + (ulong) n, + (ulong) ut_total_allocated_memory, + (int) errno); return(FALSE); } @@ -225,7 +227,7 @@ ut_free_all_mem(void) if (ut_total_allocated_memory != 0) { fprintf(stderr, "InnoDB: Warning: after shutdown total allocated memory is %lu\n", - ut_total_allocated_memory); + (ulong) ut_total_allocated_memory); } } diff --git a/innobase/ut/ut0ut.c b/innobase/ut/ut0ut.c index 10130717d2d..77f7a997777 100644 --- a/innobase/ut/ut0ut.c +++ b/innobase/ut/ut0ut.c @@ -474,7 +474,7 @@ ut_delay( } if (ut_always_false) { - printf("%lu", j); + printf("%lu", (ulong) j); } return(j); @@ -492,12 +492,12 @@ ut_print_buf( byte* data; ulint i; - printf(" len %lu; hex ", len); + printf(" len %lu; hex ", (ulong) len); data = buf; for (i = 0; i < len; i++) { - printf("%02lx", (ulint)*data); + printf("%02lx", (ulong) *data); data++; } @@ -532,12 +532,12 @@ ut_sprintf_buf( n = 0; - n += sprintf(str + n, " len %lu; hex ", len); + n += sprintf(str + n, " len %lu; hex ", (ulong) len); data = buf; for (i = 0; i < len; i++) { - n += sprintf(str + n, "%02lx", (ulint)*data); + n += sprintf(str + n, "%02lx", (ulong) *data); data++; } |