bzr push into mysql-trunk-pfs-tuning branch (marc.alff:3438 to 3439)

[Marc Alff]

 3439 Marc Alff	2011-11-09
      Fixed build break w/o pfs

    modified:
      sql/sql_class.h
 3438 Marc Alff	2011-11-08 [merge]
      Merge mysql-trunk --> mysql-trunk-pfs-tuning

    removed:
      mysql-test/suite/binlog/r/binlog_truncate_innodb.result
      mysql-test/suite/binlog/t/binlog_truncate_innodb.test
    added:
      unittest/gunit/filesort_buffer-t.cc
    modified:
      configure.cmake
      include/mysql/psi/mysql_socket.h
      include/mysql/psi/mysql_table.h
      include/mysql/psi/psi.h
      mysql-test/r/filesort_debug.result
      mysql-test/suite/binlog/t/disabled.def
      mysql-test/suite/opt_trace/include/general.inc
      mysql-test/suite/opt_trace/include/general2.inc
      mysql-test/suite/opt_trace/include/subquery.inc
      mysql-test/suite/opt_trace/r/filesort_pq.result
      mysql-test/suite/opt_trace/r/general2_no_prot.result
      mysql-test/suite/opt_trace/r/general2_ps_prot.result
      mysql-test/suite/opt_trace/r/general_no_prot_none.result
      mysql-test/suite/opt_trace/r/general_ps_prot_none.result
      mysql-test/suite/opt_trace/r/subquery_no_prot.result
      mysql-test/suite/opt_trace/r/subquery_ps_prot.result
      mysql-test/t/disabled.def
      mysql-test/t/filesort_debug.test
      mysql-test/valgrind.supp
      scripts/mysql_config.pl.in
      scripts/mysql_config.sh
      sql/filesort.cc
      sql/filesort_utils.cc
      sql/filesort_utils.h
      sql/mdl.cc
      sql/mysqld.cc
      sql/opt_trace.h
      sql/opt_trace2server.cc
      sql/sql_class.h
      sql/sql_parse.cc
      sql/sql_show.cc
      sql/table.h
      storage/innobase/btr/btr0pcur.c
      storage/innobase/ibuf/ibuf0ibuf.c
      storage/innobase/include/btr0pcur.h
      storage/innobase/include/btr0pcur.ic
      unittest/gunit/CMakeLists.txt
=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2011-11-08 23:28:12 +0000
+++ b/sql/sql_class.h	2011-11-09 20:48:50 +0000
@@ -2363,14 +2363,18 @@ 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 /* HAVE_PSI_STATEMENT_INTERFACE */
 #endif /* EMBEDDED_LIBRARY */
   /** 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 /* HAVE_PSI_IDLE_INTERFACE */
 #endif /* EMBEDDED_LIBRARY */
   /** True if the server code is IDLE for this connection. */
   bool m_server_idle;

No bundle (reason: useless for push emails).