summaryrefslogtreecommitdiff
path: root/sql/sql_profile.cc
diff options
context:
space:
mode:
authorTor Didriksen <tor.didriksen@oracle.com>2011-07-20 08:50:47 +0200
committerTor Didriksen <tor.didriksen@oracle.com>2011-07-20 08:50:47 +0200
commit9b6930ec100057fdeb7e91d5dceb8a3afa308a32 (patch)
tree0b560b9424b97109b06e1f205219f6d91f2ca9c7 /sql/sql_profile.cc
parentfce189fadba6920ec9b3b9e3775cb67c7c70dac6 (diff)
downloadmariadb-git-9b6930ec100057fdeb7e91d5dceb8a3afa308a32.tar.gz
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.
Diffstat (limited to 'sql/sql_profile.cc')
-rw-r--r--sql/sql_profile.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_profile.cc b/sql/sql_profile.cc
index 6c398ca0cb5..5910833612a 100644
--- a/sql/sql_profile.cc
+++ b/sql/sql_profile.cc
@@ -294,7 +294,7 @@ void QUERY_PROFILE::new_status(const char *status_arg,
DBUG_ASSERT(status_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
prof= new PROF_MEASUREMENT(this, status_arg);