From: Marc Alff
Date: April 28 2011 5:07am
Subject: bzr commit into mysql-trunk branch (marc.alff:3334)
List-Archive: http://lists.mysql.com/commits/136264
Message-Id: <201104280508.p3S589QJ008743@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7017167028417517580=="

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

#At file:///Users/malff/BZR_TREE/mysql-trunk-cleanup/ based on revid:vasil.dimov@stripped

 3334 Marc Alff	2011-04-27
      Fixed broken define

    modified:
      include/mysql/psi/mysql_thread.h
=== modified file 'include/mysql/psi/mysql_thread.h'
--- a/include/mysql/psi/mysql_thread.h	2011-04-28 03:11:43 +0000
+++ b/include/mysql/psi/mysql_thread.h	2011-04-28 05:07:54 +0000
@@ -1120,7 +1120,7 @@ static inline int inline_mysql_cond_broa
 }
 
 static inline void inline_mysql_thread_register(
-#ifdef HAVE_PSI_THREAD__INTERFACE
+#ifdef HAVE_PSI_THREAD_INTERFACE
   const char *category,
   PSI_thread_info *info,
   int count


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-cleanup/
# testament_sha1: adb7cb67fedbe314913f557894bfb2be23dc26cb
# timestamp: 2011-04-27 23:08:02 -0600
# base_revision_id: vasil.dimov@stripped\
#   8zxddgtmtlwcts9i
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWXIibDgAAWbfgAAQWGP/939j
XQC////wUAM9eeg7sUADSTJMTE0aaaeiaNBtQANANNqAOaYmABMAEwAAmAAJhCgyRtT0QPU9IYmT
QDIaAwmEwaaiTyjRkMmQAABoDQ0AAJJCDTTQJkyU9qjE0aaTaj09U9QaMZT1KsdwzVNIhigQvrdA
EEJVEtTjacjSSJpU8OMIfClOjg2bi5T1+ofrMQeHZ9+91UTBiEU03iOyKgQYOHpChiSkqArOMcoc
gNkiC2WMq6M6/ZSLVmmsGEOMVmM4Q5VMK+hPrF8SCeqVVdKiG1YrRdvsr7rqxHAhtIREWxaIVgSg
fKVcTKm6YxUJSzmxJAwYQ4oNsrErxwJFqQCWv9WE+Y5c0J6aUVyTihSpEYaxKQY2srIOqcHbY7ex
9Si7XAVxlHmKdYsIcxk5r1IQ5lxN9JFBAis6CjLON/Gt4vMTjeNw14nq9W86iN47ScFiYpi/JtnP
N2LsFZKzHqnynQKMVRIuoH21yZA4uLYDEYWbictlEsVphddwzjJmjwGKPNZYTJPdF9U2ppOLxOat
C0sDAGsK0yB7G9QjrLIt68tm4hRJZOLzr5BJcpHLwz5rOpxC1oqO+8taLVbLSYJTAZeZwotRCdBK
MrONY7/16hwvW47/LokPC7F4SF9QOmedFdP57wJI705enTGtvEXT4SKla/5fXwCCDoSlHc/n9/bx
1pZkjy5JGH/K0oXaYb9eMOGM+N6imepeqs4zsOC3MlH79yE6R9vsP5UCUKyN3KDMOugNictCDpjg
x4BG7I1dNHfCE2NJnVsDTCNCZR217J38ioKE7lKeMiAHWcLHmyBx6dnZK3V58B4tFsi5e9YmgVfJ
ZqahN5mLQv7vFN1qnzvOsUlsqCC0zCF/prwfEPVdQcvvDfJctG5i3F881sHeupeFK9wTCbggoSSG
G8rUHD6VzVyRp+D8jO27FY+ZloLWyCppJJpSajKo5se2NCHtLCo8Eygypcq7zME8O956pGAUr5uU
8gvyZk4vhS6GLrFyC/BVpLO+CDJMizW4r5xWFj7+CpppZME32LSuu1RB9a9/oESKKvczfsWtXeby
VV+dhYtV4q0HhlzVT1l8Vw2500x1gK5XKhaBksbFOCksQogQ7un0X/i7kinChIORE2HA


--===============7017167028417517580==--