summaryrefslogtreecommitdiff
path: root/innobase/ut
diff options
context:
space:
mode:
authorunknown <monty@hundin.mysql.fi>2001-10-31 20:28:43 +0200
committerunknown <monty@hundin.mysql.fi>2001-10-31 20:28:43 +0200
commit679e3810307de3f42619304430f31977ad8fdd83 (patch)
tree92b080e5371729d9f2b8777445095eb5e0545575 /innobase/ut
parent03f6fdd575f71aacd4b6e782c9df4b929f8222b1 (diff)
downloadmariadb-git-679e3810307de3f42619304430f31977ad8fdd83.tar.gz
Portability fixes
Diffstat (limited to 'innobase/ut')
-rw-r--r--innobase/ut/ut0mem.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/innobase/ut/ut0mem.c b/innobase/ut/ut0mem.c
index 630bd3a9b71..84a79d39556 100644
--- a/innobase/ut/ut0mem.c
+++ b/innobase/ut/ut0mem.c
@@ -78,7 +78,7 @@ ut_malloc_low(
fprintf(stderr,
"InnoDB: Fatal error: cannot allocate %lu bytes of\n"
"InnoDB: memory with malloc! Total allocated memory\n"
- "InnoDB: by InnoDB %lu bytes. Operating system errno: %lu\n"
+ "InnoDB: by InnoDB %lu bytes. Operating system errno: %d\n"
"InnoDB: Cannot continue operation!\n"
"InnoDB: Check if you should increase the swap file or\n"
"InnoDB: ulimits of your operating system.\n",
@@ -155,7 +155,7 @@ ut_free_all_mem(void)
os_fast_mutex_lock(&ut_list_mutex);
- while (block = UT_LIST_GET_FIRST(ut_mem_block_list)) {
+ while ((block = UT_LIST_GET_FIRST(ut_mem_block_list))) {
ut_a(block->magic_n == UT_MEM_MAGIC_N);
ut_a(ut_total_allocated_memory >= block->size);