diff options
| author | Jimmy Yang <jimmy.yang@oracle.com> | 2011-02-25 00:33:13 -0800 |
|---|---|---|
| committer | Jimmy Yang <jimmy.yang@oracle.com> | 2011-02-25 00:33:13 -0800 |
| commit | 56845ed3b4cb9de0bb3f33d8d7c9b1bb68e7662b (patch) | |
| tree | 1bc474ac9fb24c3588f13e6852b3127cb318b0bf /storage/innobase/mem | |
| parent | 9f699b39f86a67df2d848918b7553eb1922be36c (diff) | |
| download | mariadb-git-56845ed3b4cb9de0bb3f33d8d7c9b1bb68e7662b.tar.gz | |
Fix Bug #11765975 __FILE__ macros expanded to full path instead of relative
in CMake builds
rb://600 approved by Sunny Bains
Diffstat (limited to 'storage/innobase/mem')
| -rw-r--r-- | storage/innobase/mem/mem0dbg.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/storage/innobase/mem/mem0dbg.c b/storage/innobase/mem/mem0dbg.c index d91e610a08a..e36a372b087 100644 --- a/storage/innobase/mem/mem0dbg.c +++ b/storage/innobase/mem/mem0dbg.c @@ -400,7 +400,7 @@ mem_hash_remove( fprintf(stderr, "Memory heap or buffer freed in %s line %lu" " did not exist.\n", - file_name, (ulong) line); + innobase_basename(file_name), (ulong) line); ut_error; } @@ -419,8 +419,9 @@ mem_hash_remove( "in %s line %lu and tried to free in %s line %lu.\n" "Hex dump of 400 bytes around memory heap" " first block start:\n", - node->nth_heap, node->file_name, (ulong) node->line, - file_name, (ulong) line); + node->nth_heap, + innobase_basename(node->file_name), (ulong) node->line, + innobase_basename(file_name), (ulong) line); ut_print_buf(stderr, (byte*)node->heap - 200, 400); fputs("\nDump of the mem heap:\n", stderr); mem_heap_validate_or_print(node->heap, NULL, TRUE, &error, @@ -763,7 +764,8 @@ mem_validate_no_assert(void) "Inconsistency in memory heap" " or buffer created\n" "in %s line %lu.\n", - node->file_name, node->line); + innobase_basename(node->file_name), + node->line); mutex_exit(&mem_hash_mutex); @@ -989,7 +991,8 @@ mem_print_info_low( fprintf(outfile, "%lu: file %s line %lu of size %lu phys.size %lu" " with %lu blocks, type %lu\n", - node->nth_heap, node->file_name, node->line, + node->nth_heap, + innobase_basename(node->file_name), node->line, allocated_mem, ph_size, n_blocks, (node->heap)->type); next_heap: |