From: Tor Didriksen
Date: January 27 2011 1:47pm
Subject: bzr push into mysql-5.5 branch (tor.didriksen:3279 to 3280) Bug#59273
List-Archive: http://lists.mysql.com/commits/129770
X-Bug: 59273
Message-Id: <20110127134712.5E0AC33FC@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3280 Tor Didriksen	2011-01-27
      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.

    modified:
      sql/sql_class.cc
 3279 Mattias Jonsson	2011-01-26 [merge]
      merge of bug 47902 and (null-merge) of bug 57924.
      
      bug#57924 does not occur in 5.5, so I reverted the 5.1 specific
      code and used the errors from 5.5 instead in the tests

    modified:
      client/mysqltest.cc
      mysql-test/r/partition_error.result
      mysql-test/t/partition_error.test
=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2010-12-17 08:56:43 +0000
+++ b/sql/sql_class.cc	2011-01-27 13:25:27 +0000
@@ -272,10 +272,11 @@ const char *set_thd_proc_info(void *thd_
     thd= current_thd;
 
   const char *old_info= thd->proc_info;
-  DBUG_PRINT("proc_info", ("%s:%d  %s", calling_file, calling_line,
-                           (info != NULL) ? info : "(null)"));
+  const char *basename= calling_file ? base_name(calling_file) : NULL;
+  DBUG_PRINT("proc_info", ("%s:%d  %s", basename, calling_line, info));
+
 #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
   thd->proc_info= info;
   return old_info;

No bundle (reason: useless for push emails).