Commit 8b4fe638 authored by Tor Didriksen's avatar Tor Didriksen

Bug #59273 show profile source doesn't show Source_function or truncates Source_file

Fixed the 'show profile source' part of the bug.
Leaving SHOW ENGINE INNODB MUTEX to a separate patch.



sql/sql_class.cc:
  Use base_name(calling_file) for dbug trace and profiling.
parent 6ae9810f
...@@ -272,10 +272,11 @@ const char *set_thd_proc_info(void *thd_arg, const char *info, ...@@ -272,10 +272,11 @@ const char *set_thd_proc_info(void *thd_arg, const char *info,
thd= current_thd; thd= current_thd;
const char *old_info= thd->proc_info; const char *old_info= thd->proc_info;
DBUG_PRINT("proc_info", ("%s:%d %s", calling_file, calling_line, const char *basename= calling_file ? base_name(calling_file) : NULL;
(info != NULL) ? info : "(null)")); DBUG_PRINT("proc_info", ("%s:%d %s", basename, calling_line, info));
#if defined(ENABLED_PROFILING) #if defined(ENABLED_PROFILING)
thd->profiling.status_change(info, calling_function, calling_file, calling_line); thd->profiling.status_change(info, calling_function, basename, calling_line);
#endif #endif
thd->proc_info= info; thd->proc_info= info;
return old_info; return old_info;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment