List:Commits« Previous MessageNext Message »
From:Tor Didriksen Date:July 20 2011 7:21am
Subject:bzr push into mysql-5.5 branch (tor.didriksen:3470 to 3471) Bug#12756017
View as plain text  
 3471 Tor Didriksen	2011-07-20
      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.

    modified:
      mysql-test/t/implicit_commit.test
      sql/sql_class.cc
      sql/sql_profile.cc
 3470 Inaam Rana	2011-07-19 [merge]
      Merge from 5.1 the fix for Bug 12356373

    added:
      mysql-test/suite/sys_vars/r/innodb_random_read_ahead_basic.result
      mysql-test/suite/sys_vars/t/innodb_random_read_ahead_basic.test
    modified:
      storage/innobase/buf/buf0buf.c
      storage/innobase/buf/buf0rea.c
      storage/innobase/handler/ha_innodb.cc
      storage/innobase/include/buf0buf.h
      storage/innobase/include/buf0buf.ic
      storage/innobase/include/buf0lru.h
      storage/innobase/include/buf0rea.h
      storage/innobase/include/srv0srv.h
      storage/innobase/srv/srv0srv.c
=== modified file 'mysql-test/t/implicit_commit.test'
--- a/mysql-test/t/implicit_commit.test	2010-02-26 09:58:33 +0000
+++ b/mysql-test/t/implicit_commit.test	2011-07-20 06:50:47 +0000
@@ -1,5 +1,6 @@
 source include/have_innodb.inc;
 source include/not_embedded.inc;
+source include/have_profiling.inc;
 
 SET GLOBAL EVENT_SCHEDULER = OFF;
 SET BINLOG_FORMAT = STATEMENT;

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2011-07-07 09:42:14 +0000
+++ b/sql/sql_class.cc	2011-07-20 06:50:47 +0000
@@ -520,11 +520,11 @@ const char *set_thd_proc_info(void *thd_
     thd= current_thd;
 
   const char *old_info= thd->proc_info;
-  const char *basename= calling_file ? base_name(calling_file) : NULL;
-  DBUG_PRINT("proc_info", ("%s:%d  %s", basename, calling_line, info));
+  DBUG_PRINT("proc_info", ("%s:%d  %s", calling_file, calling_line, info));
 
 #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
   thd->proc_info= info;
   return old_info;

=== modified file 'sql/sql_profile.cc'
--- a/sql/sql_profile.cc	2011-06-30 15:46:53 +0000
+++ b/sql/sql_profile.cc	2011-07-20 06:50:47 +0000
@@ -294,7 +294,7 @@ void QUERY_PROFILE::new_status(const cha
   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);
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5 branch (tor.didriksen:3470 to 3471) Bug#12756017Tor Didriksen20 Jul