From: Marc Alff
Date: April 18 2011 11:05pm
Subject: bzr commit into mysql-trunk branch (marc.alff:3325) Bug#12338397
List-Archive: http://lists.mysql.com/commits/135681
X-Bug: 12338397
Message-Id: <201104182305.p3IN5sDs008458@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3973962452352819010=="

--===============3973962452352819010==
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-bug12338397/ based on revid:alexander.nozdrin@stripped

 3325 Marc Alff	2011-04-18
      Bug#12338397 TRUNK DOES NOT BUILD WITHOUT PERFORMANCE SCHEMA DUE TO STAGES/STATEMENTS
      
      Prior to this fix, building the MySQL server without the performance schema failed,
      because of the recently added stage and statement instrumentation.
      
      With this fix,
      - the PSI_stage_info structure is defined even when building without the performance schema,
        because it is also used for the THD::set_proc_info instrumentation.
      - the code using PSI_statement_info, for the statement instrumentation,
        has been protected with #ifdef.

    modified:
      include/mysql/psi/psi.h
      include/mysql/psi/psi_abi_v2.h.pp
      sql/mysqld.h
=== modified file 'include/mysql/psi/psi.h'
--- a/include/mysql/psi/psi.h	2011-02-14 14:23:55 +0000
+++ b/include/mysql/psi/psi.h	2011-04-18 23:05:27 +0000
@@ -1710,6 +1710,20 @@ struct PSI_file_info_v2
 };
 
 /** Placeholder */
+struct PSI_stage_info_v2
+{
+  /** Placeholder */
+  int placeholder;
+};
+
+/** Placeholder */
+struct PSI_statement_info_v2
+{
+  /** Placeholder */
+  int placeholder;
+};
+
+/** Placeholder */
 struct PSI_mutex_locker_state_v2
 {
   /** Placeholder */
@@ -1834,6 +1848,31 @@ struct PSI_none
 };
 typedef struct PSI_none PSI;
 
+/**
+  Stage instrument information.
+  @since PSI_VERSION_1
+  This structure is used to register an instrumented stage.
+*/
+struct PSI_stage_info_none
+{
+  /** Unused stage key. */
+  unsigned int m_key;
+  /** The name of the stage instrument. */
+  const char *m_name;
+  /** Unused stage flags. */
+  int m_flags;
+};
+
+/**
+  The stage instrumentation has to co exist with the legacy
+  THD::set_proc_info instrumentation.
+  To avoid duplication of the instrumentation in the server,
+  the common PSI_stage_info structure is used,
+  so we export it here, even when not building
+  with HAVE_PSI_INTERFACE.
+*/
+typedef struct PSI_stage_info_none PSI_stage_info;
+
 #endif /* HAVE_PSI_INTERFACE */
 
 extern MYSQL_PLUGIN_IMPORT PSI *PSI_server;

=== modified file 'include/mysql/psi/psi_abi_v2.h.pp'
--- a/include/mysql/psi/psi_abi_v2.h.pp	2011-02-14 14:23:55 +0000
+++ b/include/mysql/psi/psi_abi_v2.h.pp	2011-04-18 23:05:27 +0000
@@ -98,6 +98,14 @@ struct PSI_file_info_v2
 {
   int placeholder;
 };
+struct PSI_stage_info_v2
+{
+  int placeholder;
+};
+struct PSI_statement_info_v2
+{
+  int placeholder;
+};
 struct PSI_mutex_locker_state_v2
 {
   int placeholder;

=== modified file 'sql/mysqld.h'
--- a/sql/mysqld.h	2011-03-18 22:51:17 +0000
+++ b/sql/mysqld.h	2011-04-18 23:05:27 +0000
@@ -388,6 +388,7 @@ extern PSI_stage_info stage_waiting_for_
 extern PSI_stage_info stage_waiting_to_finalize_termination;
 extern PSI_stage_info stage_waiting_to_get_readlock;
 
+#ifdef HAVE_PSI_INTERFACE
 /**
   Statement instrumentation keys (sql).
   The last entry, at [SQLCOM_END], is for parsing errors.
@@ -402,6 +403,7 @@ extern PSI_statement_info com_statement_
 
 void init_sql_statement_info();
 void init_com_statement_info();
+#endif /* HAVE_PSI_INTERFACE */
 
 #ifndef __WIN__
 extern pthread_t signal_thread;


--===============3973962452352819010==
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-bug12338397/
# testament_sha1: c64a58a254252a457563a7cf1a44e2f442741166
# timestamp: 2011-04-18 17:05:46 -0600
# base_revision_id: alexander.nozdrin@stripped\
#   c24cmv7xz31ahtex
# 
# Begin bundle
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


--===============3973962452352819010==--