bzr push into mysql-trunk-wl5767 branch (chris.powers:3428 to 3429) WL#5767

[Christopher Powers]

 3429 Christopher Powers	2012-02-12
      WL#5767 PERFORMANCE_SCHEMA, statement digest
      
      - Fixed build break for builds with no perfschema
      - Fixed warning in pfs_noop.c

    modified:
      include/mysql/psi/psi.h
      mysys/psi_noop.c
      sql/sql_lex.h
 3428 Christopher Powers	2012-02-11
      WL#5767 PERFORMANCE_SCHEMA STATEMENT DIGEST
      
      - Fixed PB2 crash

    modified:
      storage/perfschema/pfs_digest.cc
      storage/perfschema/pfs_digest.h
      storage/perfschema/pfs_server.cc
      storage/perfschema/table_esms_by_digest.cc
=== modified file 'include/mysql/psi/psi.h'
--- a/include/mysql/psi/psi.h	2012-02-10 12:55:57 +0000
+++ b/include/mysql/psi/psi.h	2012-02-12 20:08:11 +0000
@@ -352,6 +352,7 @@ typedef struct PSI_socket_locker PSI_soc
   This is an opaque structure.
 */
 struct PSI_digest_locker;
+typedef struct PSI_digest_locker PSI_digest_locker;
 
 /** Operation performed on an instrumented mutex. */
 enum PSI_mutex_operation

=== modified file 'mysys/psi_noop.c'
--- a/mysys/psi_noop.c	2012-02-09 14:41:43 +0000
+++ b/mysys/psi_noop.c	2012-02-12 20:08:11 +0000
@@ -25,8 +25,6 @@
 #include "my_sys.h"
 #include "mysql/psi/psi.h"
 
-typedef struct PSI_digest_locker PSI_digest_locker;
-
 C_MODE_START
 
 #define NNN __attribute__((unused))
@@ -441,7 +439,7 @@ static void start_stage_noop(PSI_stage_k
   return;
 }
 
-static void end_stage_noop()
+static void end_stage_noop(void)
 {
   return;
 }
@@ -615,9 +613,10 @@ digest_start_noop(PSI_statement_locker *
   return NULL;
 }
 
-static PSI_digest_locker* digest_add_token_noop(PSI_digest_locker *locker NNN,
-                                                uint token NNN,
-                                                struct OPAQUE_LEX_YYSTYPE *yylval NNN)
+static PSI_digest_locker*
+digest_add_token_noop(PSI_digest_locker *locker NNN,
+                      uint token NNN,
+                      struct OPAQUE_LEX_YYSTYPE *yylval NNN)
 {
   return NULL;
 }

=== modified file 'sql/sql_lex.h'
--- a/sql/sql_lex.h	2012-02-10 21:20:10 +0000
+++ b/sql/sql_lex.h	2012-02-12 20:08:11 +0000
@@ -2126,12 +2126,10 @@ public:
   */
   CHARSET_INFO *m_underscore_cs;
 
-#ifdef HAVE_PSI_STATEMENT_DIGEST_INTERFACE
   /**
-    attribute for statement digest. 
+    Current statement digest instrumentation. 
   */
   PSI_digest_locker* m_digest_psi;
-#endif
 };
 
 /* The state of the lex parsing. This is saved in the THD struct */

No bundle (reason: useless for push emails).