From: Marc Alff
Date: May 5 2011 1:15am
Subject: bzr commit into mysql-trunk-pfs-tuning branch (marc.alff:3373)
List-Archive: http://lists.mysql.com/commits/136696
Message-Id: <201105050115.p451Fcu9030531@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============6965582280117670741=="

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

 3373 Marc Alff	2011-05-04
      Added missing new file psi_provider.h

    added:
      include/psi_provider.h
=== added file 'include/psi_provider.h'
--- a/include/psi_provider.h	1970-01-01 00:00:00 +0000
+++ b/include/psi_provider.h	2011-05-05 01:15:08 +0000
@@ -0,0 +1,52 @@
+/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; version 2 of the License.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software Foundation,
+  51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
+
+#ifndef PSI_PROVIDER_H
+#define PSI_PROVIDER_H
+
+#include <my_global.h>
+
+#ifdef WANT_STATIC_PSI_CALL
+
+/* PSI provider: performance schema */
+#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
+
+/*
+  Performance optimization for static builds.
+  Compiling static calls to the performance schema,
+  to bypass the dynamic PSI_server interface.
+*/
+
+#define USE_PSI_V1
+#define PSI_CALL(API) pfs_ ## API ## _v1
+#include <../storage/perfschema/pfs_api.h>
+#endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */
+
+/* PSI_provider: <insert other provider here> */
+
+#endif /* WANT_STATIC_PSI_CALL */
+
+/*
+  By default, dynamic call.
+*/
+
+#ifndef PSI_CALL
+#define PSI_CALL(API) PSI_server->API
+#include <mysql/psi/psi.h>
+extern MYSQL_PLUGIN_IMPORT PSI *PSI_server;
+#endif
+
+#endif
+


--===============6965582280117670741==
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: 714a4ea31fbfb4c44ad6e2a2ba0b91b4ee1c0ea1
# timestamp: 2011-05-04 19:15:30 -0600
# base_revision_id: marc.alff@stripped\
#   8lznmzmoc73jm2ko
# 
# Begin bundle
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


--===============6965582280117670741==--