From: Marc Alff
Date: May 4 2011 5:12am
Subject: bzr commit into mysql-trunk-pfs-tuning branch (marc.alff:3369)
List-Archive: http://lists.mysql.com/commits/136608
Message-Id: <201105040513.p445D9qx001310@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5026524216522565615=="

--===============5026524216522565615==
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-pfs-tuning/ based on revid:marc.alff@stripped

 3369 Marc Alff	2011-05-03
      Fixed the windows link (missing _PSI_hook)

    modified:
      mysys/psi_noop.cc
=== modified file 'mysys/psi_noop.cc'
--- a/mysys/psi_noop.cc	2011-05-04 03:19:36 +0000
+++ b/mysys/psi_noop.cc	2011-05-04 05:12:55 +0000
@@ -15,6 +15,7 @@
 
 #include "my_global.h"
 #include "my_pthread.h"
+#include "my_sys.h"
 #include "mysql/psi/psi.h"
 
 #ifdef HAVE_PSI_INTERFACE
@@ -615,6 +616,8 @@ static PSI PSI_noop=
 };
 #endif
 
+extern "C" {
+
 /**
   Hook for the instrumentation interface.
   Code implementing the instrumentation interface should register here.
@@ -632,5 +635,5 @@ struct PSI_bootstrap *PSI_hook= NULL;
 */
 PSI *PSI_server= & PSI_noop;
 
-
+}
 


--===============5026524216522565615==
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-pfs-tuning/
# testament_sha1: 9d0dc7f862f73cc9b21fa0aedfa5a02d0788150b
# timestamp: 2011-05-03 23:13:02 -0600
# base_revision_id: marc.alff@stripped\
#   t49m2lms6brap8y7
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYuorXYAAYBfgAAQWGP/93si
SAC////6UANc8D06PbuCg01U9DRDRppoDI09I00AADJoIpoBMmaT0mnoTJtAEMmTRhMINFNE8o/U
TE9JkyBoNBoAAAICJPUHqZNG1AAAHqDIBoeoJJEyGiYmJpkJhNTyTTKPUMTymj1P0d1aoJ1jgDjE
GnUAQllcpRo4kmZ2edEj2ERAEU42C9rYQtUayQrizDpVna2FFMlJCCRH3mbXRt5b9wJlMSIdHGzX
QSPcRtyFXpphdSSy3L3zIVWJHws0iF9kptn1k0Q4szDNpzHj8cBngoWqdjjSOEXwgmBMKhvNk9e5
O76z1gO5entEFmV8JAnPsF7zX8sqqiKr3S2XKXacHP9e2OBHOrPZHcSqVZtQuUTJbLBNYdCU12+j
RGMA74wl1WNKnazgxW1Rh40TvMdQ4nGhIeI3uWEk/jBiMbZXEq3mKiVlh+torfkVteQqnoR4BdWC
SGEKZTULSNZYW7RcU4szBiaUPrOacEsRxlUX1eC4VoPWptRrmtWsrrUxsY7LSbSBDFiitq/GiFUS
04aETM8UztKd5HVUbONOpSE5zGslk62poxRueOg9MsthoBxZoGOGB6h9RE/SWFEDzgskEeFq2Umq
p2m4uAh6rv5THaD1qrzH5HXrPwPXd19EiC6FF0wazskNhh9CAUfrikVoZc++Bbacxjbj3d3Xbd1F
r9UyRf5Gath556fuKhzJD50izA4Xnnb4X1SUysdWQvFFYXbCO4VTI++6YQAcQkPlFFhwpl4XhGP4
LAEHEYDdesH7ibEuUg2BRdrAYOaFLy4mGSSfKHQG0mVGwx6ElmaRA0CJYyiB8eEryAqHBlaavn6I
gq0NNnPoBzgTIoEmbfEQxrDClF8t/qhNHkXmieZfH4DbbZXu/zflHwFOHUOh/z6a5qt29zsgn+dw
OClwc+c6Q0G+dEja1/t7KqnO4R2XATsw+D7jO39FCybWeGnaMYlqcVP8ZSnDGd4nsoYObctYtETM
mV/kOFVQU7Ejk0A+1/FUTpvlI+gVrk5Q7Ms+exZbWZTEL/tLOOngz6irNSSXoD0BR0sI8J07WqBT
rplS3sGk9bW+GmiE9QApGFdrkgfDDQBpzgnkkfcXKeab7lzWtidGjs32FAUhVM5XPnhhLLVTCfGS
wCimzK3vIVtAVr0WMBjgj+TCh7UV7//F3JFOFCQi6itdgA==


--===============5026524216522565615==--