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/ut | |
| 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/ut')
| -rw-r--r-- | storage/innobase/ut/ut0dbg.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/storage/innobase/ut/ut0dbg.c b/storage/innobase/ut/ut0dbg.c index 42ad8c03762..64fadd76d1c 100644 --- a/storage/innobase/ut/ut0dbg.c +++ b/storage/innobase/ut/ut0dbg.c @@ -25,6 +25,7 @@ Created 1/30/1994 Heikki Tuuri #include "univ.i" #include "ut0dbg.h" +#include "ha_prototypes.h" #if defined(__GNUC__) && (__GNUC__ > 2) #else @@ -55,12 +56,13 @@ ut_dbg_assertion_failed( ut_print_timestamp(stderr); #ifdef UNIV_HOTBACKUP fprintf(stderr, " InnoDB: Assertion failure in file %s line %lu\n", - file, line); + innobase_basename(file), line); #else /* UNIV_HOTBACKUP */ fprintf(stderr, " InnoDB: Assertion failure in thread %lu" " in file %s line %lu\n", - os_thread_pf(os_thread_get_curr_id()), file, line); + os_thread_pf(os_thread_get_curr_id()), + innobase_basename(file), line); #endif /* UNIV_HOTBACKUP */ if (expr) { fprintf(stderr, @@ -93,7 +95,8 @@ ut_dbg_stop_thread( { #ifndef UNIV_HOTBACKUP fprintf(stderr, "InnoDB: Thread %lu stopped in file %s line %lu\n", - os_thread_pf(os_thread_get_curr_id()), file, line); + os_thread_pf(os_thread_get_curr_id()), + innobase_basename(file), line); os_thread_sleep(1000000000); #endif /* !UNIV_HOTBACKUP */ } |