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/sync/sync0arr.c | |
| 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/sync/sync0arr.c')
| -rw-r--r-- | storage/innobase/sync/sync0arr.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/storage/innobase/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c index 3ecbce72ebd..0d1581b41b4 100644 --- a/storage/innobase/sync/sync0arr.c +++ b/storage/innobase/sync/sync0arr.c @@ -40,6 +40,7 @@ Created 9/5/1995 Heikki Tuuri #include "os0sync.h" #include "os0file.h" #include "srv0srv.h" +#include "ha_prototypes.h" /* WAIT ARRAY @@ -478,8 +479,8 @@ sync_array_cell_print( fprintf(file, "--Thread %lu has waited at %s line %lu" " for %.2f seconds the semaphore:\n", - (ulong) os_thread_pf(cell->thread), cell->file, - (ulong) cell->line, + (ulong) os_thread_pf(cell->thread), + innobase_basename(cell->file), (ulong) cell->line, difftime(time(NULL), cell->reservation_time)); if (type == SYNC_MUTEX) { @@ -493,7 +494,8 @@ sync_array_cell_print( "Last time reserved in file %s line %lu, " #endif /* UNIV_SYNC_DEBUG */ "waiters flag %lu\n", - (void*) mutex, mutex->cfile_name, (ulong) mutex->cline, + (void*) mutex, innobase_basename(mutex->cfile_name), + (ulong) mutex->cline, (ulong) mutex->lock_word, #ifdef UNIV_SYNC_DEBUG mutex->file_name, (ulong) mutex->line, @@ -512,7 +514,7 @@ sync_array_cell_print( fprintf(file, " RW-latch at %p created in file %s line %lu\n", - (void*) rwlock, rwlock->cfile_name, + (void*) rwlock, innobase_basename(rwlock->cfile_name), (ulong) rwlock->cline); writer = rw_lock_get_writer(rwlock); if (writer != RW_LOCK_NOT_LOCKED) { @@ -533,7 +535,7 @@ sync_array_cell_print( (ulong) rw_lock_get_reader_count(rwlock), (ulong) rwlock->waiters, rwlock->lock_word, - rwlock->last_s_file_name, + innobase_basename(rwlock->last_s_file_name), (ulong) rwlock->last_s_line, rwlock->last_x_file_name, (ulong) rwlock->last_x_line); |