From: Tor Didriksen
Date: January 27 2011 1:46pm
Subject: bzr commit into mysql-trunk branch (tor.didriksen:3561)
List-Archive: http://lists.mysql.com/commits/129768
Message-Id: <20110127134650.D358533FC@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///export/home/didrik/repo/trunk/ based on revid:horst.hunger@stripped

 3561 Tor Didriksen	2011-01-27 [merge]
      merge 5.5 => trunk

    modified:
      sql/sql_class.cc
=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2010-12-17 16:14:15 +0000
+++ b/sql/sql_class.cc	2011-01-27 13:46:28 +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;
 #ifdef HAVE_PSI_INTERFACE

No bundle (reason: revision is a merge (you can force generation of a bundle with env var BZR_FORCE_BUNDLE=1)).