bzr push into mysql-trunk branch (marc.alff:3609 to 3610) Bug#13389196

[Marc Alff]

 3610 Marc Alff	2011-11-15
      Bug#13389196 BUILD FAILS IF P_S IS DISABLED WITH: -DWITH_PERFSCHEMA_STORAGE_ENGINE:BOOL=OFF
      
      Before this fix, the code failed to build without the performance schema.
      
      The problem was that in sql/sql_class.h, the structures:
      - PSI_statement_locker_state
      - PSI_idle_locker_state
      are undefined in this case.
      
      The fix is to use the proper #ifdef symbol when compiling with a given
      performance schema instrumentation:
      - HAVE_PSI_STATEMENT_INTERFACE for the statement instrumentation
      - HAVE_PSI_IDLE_INTERFACE for the idle instrumentation

    modified:
      sql/sql_class.h
 3609 Tor Didriksen	2011-11-15 [merge]
      merge 5.5 => trunk

    modified:
      sql/item_func.cc
=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2011-11-10 09:55:20 +0000
+++ b/sql/sql_class.h	2011-11-15 10:55:52 +0000
@@ -2362,16 +2362,16 @@ public:
 
   /** Current statement instrumentation. */
   PSI_statement_locker *m_statement_psi;
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_PSI_STATEMENT_INTERFACE
   /** Current statement instrumentation state. */
   PSI_statement_locker_state m_statement_state;
-#endif /* EMBEDDED_LIBRARY */
+#endif /* HAVE_PSI_STATEMENT_INTERFACE */
   /** Idle instrumentation. */
   PSI_idle_locker *m_idle_psi;
-#ifndef EMBEDDED_LIBRARY
+#ifdef HAVE_PSI_IDLE_INTERFACE
   /** Idle instrumentation state. */
   PSI_idle_locker_state m_idle_state;
-#endif /* EMBEDDED_LIBRARY */
+#endif /* HAVE_PSI_IDLE_INTERFACE */
   /** True if the server code is IDLE for this connection. */
   bool m_server_idle;
 

No bundle (reason: useless for push emails).