From: Tor Didriksen
Date: January 20 2011 3:09pm
Subject: bzr commit into mysql-5.5 branch (tor.didriksen:3271) Bug#59273
List-Archive: http://lists.mysql.com/commits/129288
X-Bug: 59273
Message-Id: <20110120150902.05ABA372E@atum07.norway.sun.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2423589265248411514=="

--===============2423589265248411514==
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:martin.hansson@stripped

 3271 Tor Didriksen	2011-01-20
      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-20 15:08:59 +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;


--===============2423589265248411514==
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\
#   81ea2yion95rtvqs
# target_branch: file:///export/home/didrik/repo/5.5-bug59273FILE/
# testament_sha1: 91ade32d2bee7cfa17cedda7120889688d2f4e81
# timestamp: 2011-01-20 16:09:01 +0100
# base_revision_id: martin.hansson@stripped\
#   ko4u8sf72seqzw3h
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWVavz8YAAcHfgEAQWvf//9fn
3sC////wUASB5qk93BQDoIaIIxRP0mg000xJpppkZAANNMmGpkAyiMhpkYoymE9IaB6jQAAaAAA4
yZMmIxMAJkwTIAaMIwBDARMU2pqDEAA0AAAAAAAASSEyCZoQJtTE0ANU2KNPKGRkaB6amnpMd2ha
kfW8HZmuQS3VmVq9WUYIV1tStEyb/sgtFqzM7fJotGZlt1FHUtkSBGaIMS0quNfE/3z5slujjS7M
coPMgpHvWLG39oZO221OR0QYoa2YoAoPg2a7ldlvDgnl7c8CbxGlBB987EaJD1JJHKgOnQqGE1qK
IqgQq5wUuVs0jcZb2FhbQSpwvLNsRWkbUrlKzRG+iEtUUpt3LutW6hMgYQyZhPuHhJiLxZ1xMGKE
4fU+TVqtgctlCcgbaysTxbrV0lZA0KXIQZ0NfBzHZzePmlgN+XM7XgnCLn85+Hl9vAv28gtmmCht
sEVoHvdWyq5YDGtlgqL2CJOYSYAMBnS9qyyAkhjoalFbJLTK68x/CuZYihlzrbMK8Wkx5Zy/r+vK
s3LwrKxYY5e1Ox+jgr6SAqF6dvUS5M5ECHNCp9GDiduy0wzQqYfGt1mK4SxaajknGrkWSn1Z30sY
o1BGJwUyGAaHIKIvQ1LK2nMDhXMSqy0MUH1JfIFtxmqUgSrtZSFB76jQNwGgrGKxtfKpK4DHe6Fl
YEJ5JjFWsUE1AILJRkiEYQ0YAMQTuhzqA5MvC5EApRUdnVQ3LCCGmu4jM0Xubcwbo2J7qXQcOGza
zhWqhatMRuNKKuPGChTj3P+r9Fk+7vRq+9Mzc7ZeDggMR2xL3B0UC6uLl5Du8ccT7eB6fBkinwGU
x4fDEWcWMMcUXWJcV+CNSHD5VufVbuv8e+q4PXSe/I5qY+NS7kYBu0nv3Qv9K/mMuX9A/Jq9IfnX
0yy4Husqe9DkitI1USPXc5ujLX08lpJdFCdAgttlO6c0ugokg2Ttm2m97n6GHdB2PMXjOQoqpCLK
aRjlb0G+kPQ8cgcBELoJcIfpLvb/QQzzpXgaeo9dsetq/V0EjqP3TJwZa9TzauZ+9+SpCC2Phauc
w9xyq+i1b35lGKYpWu4n1ntcOOG1umB18qHqBE7YMzMzJZhTntmcmxONIN2JoKgzNQrwgtNe1reN
4frvSfS41p8gMEKg0MuAdhdZRxquiA/LPTWYn0ExSHP8X17uQomG8JrAHAeH0MgsCxy9oIsRjSA5
IZWDEhc2dhcH3iNDVLYoicUmOyO+MSWKpwliw9MkPSaY5ZTrYaIosJO09lj1RSiLJlepxczg1LB6
wW654bNQKtIxTc76D55qbUv+SGB64OWDjSPIS6DExUAzBkSgoCJQy7kLXnIv0oPCzdcTRiBqOWYz
AOWLklxhjMHIs6LilVHDcBYp6KFOTBJuCzUMqfMUnLWUN5toQzsIwKP2qJZwHLCaznimJ4UH+9IP
uNLXTUjL+WssZzk+5EjWDeUkQq3zlBvMoHjrXWnFzl5uyrsGXaZQUrzEaXlcE19pVJ7rHLXa8VH4
rX8eld8WM2Aad8V49ymo3bQ21CgvBRWMVcM3OKqUTFWc/4u5IpwoSCtX5+MA


--===============2423589265248411514==--