From: Marc Alff
Date: May 20 2011 6:59am
Subject: bzr commit into mysql-trunk-pfs-tuning branch (marc.alff:3376)
List-Archive: http://lists.mysql.com/commits/137762
Message-Id: <20110520065957.26C102FECFF@linux-8edv.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7926195858336121786=="

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

#At file:///home/malff/BZR_TREE/mysql-trunk-pfs-tuning/ based on revid:marc.alff@stripped

 3376 Marc Alff	2011-05-20
      Disabled static PSI_CALL due to unresolved build issues

    modified:
      include/psi_provider.h
=== modified file 'include/psi_provider.h'
--- a/include/psi_provider.h	2011-05-05 01:15:08 +0000
+++ b/include/psi_provider.h	2011-05-20 06:59:52 +0000
@@ -18,6 +18,9 @@
 
 #include <my_global.h>
 
+/* TODO: resolve build issues with unit tests. */
+#undef WANT_STATIC_PSI_CALL
+
 #ifdef WANT_STATIC_PSI_CALL
 
 /* PSI provider: performance schema */


--===============7926195858336121786==
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:///home/malff/BZR_TREE/mysql-trunk-pfs-tuning/
# testament_sha1: 7fe80df28e116d177625c4f3eee785c96fb4c08f
# timestamp: 2011-05-20 08:59:57 +0200
# source_branch: file:///home/malff/BZR_TREE/mysql-trunk/
# base_revision_id: marc.alff@stripped\
#   w0ezsd4axakt8dns
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWb5OnF8AAXffgAAQWHP/934n
zIC////wUAN62j03O7FFyhJJA1ME01Tw000DSTZEaaPU9T1NPJlNAkomSansRoARNqQMg0NMgBoA
aBAmqfpPVN6KPUNAAAAANAHNMTAAmACYAATAAEwZRQ9NT9UepoNAADIDEAAAbtslP0zfg1RXOwW+
0gBZETE0hDCvU8zMeviNLQMlisEpxeWO48czufxCsPu17EFTiT929s9cOKvRz3jmFbs2a3dys8RE
7BRN8MYVa6+OWSZXDmkSSOK544XRpz8tbKUNOihFIgOUm3gVOdiYAm0CoL4m57pkpRiF21k79Lp0
F2zQx683naC7uRv6c1JJUOna6ZpC+A5RP3W2yMF698dE8/RUQdIjhxpweykUsxoo5gmrR2x0SnDg
jV4U8nQV2wpRsr6xQgReUy6KDHjVVJpeMV21FziiumYGhEKQg/gWgvKNF4FYLDdAa55HzEGtAD6l
hBpYdWxXqSxKt3qsWhW3Kone1RrGEe1nTMvvYwsxhBOLrXCZcyw3p4Pp5C4UWbLO8osessnEC+Qr
VwGhhr5hBw952qJK65p4HB5C9QjlI4G4MA+B8Qpnyl4YoGL/LyuSOR27T4Chhj27nTPtjf3PydCJ
usWCfuOfHD3acqflosYOC5fqE27G2whs2no/j6pE8Dg3n0XokYaqbPu35ESHETVlkBljn1xJKLUl
KGUHCGaQEgUSN0aBxzd0nLvH3lnh8emx5g1iRRzSMYmAyeHVLv4eDlHCginppTGRqXGVxwqrFrJF
D/M9/+yTVOBV0tVm1+F+mJr3YJA8bymeKA56qdjNgqnLflToab3cbipMvaUMk1N1mhnlhG4GTq1Z
RM5IgYygsB/dl2Vi/DMOtOGG9D9PmaOke9PNQhanknLShkPV4Lmmv2ORsqDN+QSr/ms3Wh87AlH1
mvVJp3eIo5LRO+uksDhkgWu4KAodeJlSVXqhIY68pgWbVNJhQs4dT1GddepYKC18MJ52ujiC6OBF
MLiyBPbcsqImTKfdudv0GMFGHCI+EiQHp7lY9YV3XsYqB93Loup6lrqzy9mudrWikkt3uQE+MedB
VSRQwWoDnMZJioyvbIqBDpiYnMogJItmItzI8HWQCUCVdSwKxMugQBvFLi3Oxo4nooIXATAwRylF
szrFjJlRcP/s4xZTURVqwCShw037Ef6fdknv7CCmr3SBQxDwP8XckU4UJC+TpxfA


--===============7926195858336121786==--