From: Tor Didriksen
Date: January 27 2011 1:25pm
Subject: bzr commit into mysql-5.5 branch (tor.didriksen:3280) Bug#59273
List-Archive: http://lists.mysql.com/commits/129760
X-Bug: 59273
Message-Id: <20110127132530.E47E733FC@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8802667596551169673=="

--===============8802667596551169673==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#At file:///export/home/didrik/repo/5.5-bug59273FILE/ based on revid:mattias.jonsson@stripped

 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
=== 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;


--===============8802667596551169673==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/tor.didriksen@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: tor.didriksen@stripped\
#   w0so1o5tzi9o6vlz
# target_branch: file:///export/home/didrik/repo/5.5-bug59273FILE/
# testament_sha1: d14df207ab96fce79b19db13596cf062f2bc99ba
# timestamp: 2011-01-27 14:25:30 +0100
# base_revision_id: mattias.jonsson@stripped\
#   8fngni1uuyybmz9u
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVrZeh4AAb/fgEAQWvf//9fn
3sC////wUASB4OhkKAABoQU9ETwk9T01PTJHojEPUGgDQ00xPUyaHGTJkxGJgBMmCZADRhGAIYCF
Q0eRqNGjQNGahkMQAAaNMI0YhxkyZMRiYATJgmQA0YRgCGASRIyAmJom0mEZJpibUwkyaZNBoHqa
aec53qWLTTvB3Z5WzIsyu8b6zBC2xymIEo9ULPHFM9skz0mZlq0FFYx2JBGaNjYpcj0EMHtX1ZJL
N1L9ZzA60KWCBgi176XUPSPKyPwhyxpdhaFiBurTxXHSVclGPtrbfnJi0IQ0HHdS8f0okqQW6UXa
tGxZRFYCFnCU3g9Ot35kKp1JdAJlIv2Tc6Kkjck6jVo2YYTUTpdrVK6/uuW+SZAyReMKMsVE7yli
Kg0/ULbYq2DZIJIN7qhZy3hMgeDiP7i9W7GkWNnqXcelndv4WcfCtWHDN8FzF3UXZ9TqwTrbQI2v
Tz7hU7ZlvFe4pEjJlAwYLivnJQVEmqqUpKgUyaxYZyN89FNj6lAvrzYf8pRpMGs3c2jRlE0ZnPLQ
FJSVY94EgFISTWKOM2ISKgsKPPOmVAC21AKBjHASHJXTQokuenKbA15XRqYhQ0tI0rhStaxKdSw1
qYUxGUDdM/Vrellg1RdfU6uMa7Fovax5x1jnntbDRKRotZPc63rNbAJ7RwrUxY+NklEuuxt90703
GfgLtWXdfzc1IaGw0mmedos6gORdTPGLwLo0BRFod59eJbs5NbiPyffn6eR7otAh83HyMzSirY4b
I3Kzcz7du3Vrdtt2WnmKhN81JZu3LJbrvUrcqS3DlrIS95GZ1HPmQBYMNoaIkAnYOwZR0uew9vs9
p+P5MkU8046uJg8s4sRZ5s+cusSoXmjSjuJqK3gFVu3S/u1edV4el9t2R5H0WXnT42ruRUD1Xv+F
p8Kf1GW2f4ojiHysjr3HKqiEEOkUpGM8j0vdunU+WnhbO0lwnT4kyr67rkuJNOg1Zq7m0XQeGhh+
J64F8BnQK8vlGBSlS4Q7GcGIcCcAuB8CENEOgs2GZ7fiuYMCM95T+temPM1Xo+KR1n7pk+2jXA3L
ph0Q3KgJlthNpWoyNqu01Lq9s5EkrTN2H2tHO3c3XMdngtyJlOSOiZmZmZKwWDq7d0mvYnNgMQVc
FeEFQspCqmW55++4Pp0JQk5qUJAXoU5jxDsLq5uVOaIEOfGioxCQcPnCnkt2RG4N4YAwHT9TYFYV
uvtMipGFADpDKoYkLfnYXRDOK8Ri2tVqQmKTPrj0RiSxXFU40aGSdJsB1swrYaQosJPavWtrWxCl
EmTLBSndnCwXrF4CxnWK6b4BpyBWIqTdX3U0T9s1NyX3SGCC9TrF1YfuTea4rGcKube7Jhpirh4K
y9bo/xSvGrvtSp6bRmAzLB0lxmwzA6Kuu0oVJ1bwK1mxnWaTBJupWT0RZP78ETp7ozE/6RMAGV2A
V2wPTgEKzO1fuFaqDV/LWWM7qFqKDSDcpImp2Xymb3k5AfM9pyd173ynVVZ1mU6ovM40fLMFy7JU
qD1usswfEUcuS+fFdtTFucNG+K8fFWLsWCov3hzi3zLoFFaYrAZvkq1vRYrJQapYCp/8XckU4UJB
a2XoeA==


--===============8802667596551169673==--