Commit 9b6930ec authored by Tor Didriksen's avatar Tor Didriksen

Bug#12756017 - PROFILING: SET_THD_PROC_INFO DOES NOT NEED TO CALL DIRNAME_LENGTH EACH TIME




mysql-test/t/implicit_commit.test:
  Test fails if server is compiled with -DENABLED_PROFILING=0
sql/sql_class.cc:
  Let class PROFILING do its own handling of the input file name.
sql/sql_profile.cc:
  Store only basename of file argument.
parent fce189fa
source include/have_innodb.inc; source include/have_innodb.inc;
source include/not_embedded.inc; source include/not_embedded.inc;
source include/have_profiling.inc;
SET GLOBAL EVENT_SCHEDULER = OFF; SET GLOBAL EVENT_SCHEDULER = OFF;
SET BINLOG_FORMAT = STATEMENT; SET BINLOG_FORMAT = STATEMENT;
......
...@@ -520,11 +520,11 @@ const char *set_thd_proc_info(void *thd_arg, const char *info, ...@@ -520,11 +520,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;
const char *basename= calling_file ? base_name(calling_file) : NULL; DBUG_PRINT("proc_info", ("%s:%d %s", calling_file, calling_line, info));
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, basename, calling_line); thd->profiling.status_change(info,
calling_function, calling_file, calling_line);
#endif #endif
thd->proc_info= info; thd->proc_info= info;
return old_info; return old_info;
......
...@@ -294,7 +294,7 @@ void QUERY_PROFILE::new_status(const char *status_arg, ...@@ -294,7 +294,7 @@ void QUERY_PROFILE::new_status(const char *status_arg,
DBUG_ASSERT(status_arg != NULL); DBUG_ASSERT(status_arg != NULL);
if ((function_arg != NULL) && (file_arg != NULL)) if ((function_arg != NULL) && (file_arg != NULL))
prof= new PROF_MEASUREMENT(this, status_arg, function_arg, file_arg, line_arg); prof= new PROF_MEASUREMENT(this, status_arg, function_arg, base_name(file_arg), line_arg);
else else
prof= new PROF_MEASUREMENT(this, status_arg); prof= new PROF_MEASUREMENT(this, status_arg);
......
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