bzr push into mysql-6.0-perf branch (marc.alff:2745 to 2746)

[Marc Alff]

 2746 Marc Alff	2008-11-26
      Fixed build break
modified:
  include/mysql/mysql_mutex.h

 2745 Marc Alff	2008-11-26
      Implemented TRUNCATE for performance schema tables.
      Added table instrumentation in psi.h
modified:
  include/mysql/mysql_mutex.h
  include/mysql/psi.h
  include/mysql/psi_abi_v1.h.pp
  include/mysql/psi_abi_v2.h.pp
  mysql-test/suite/perfschema/r/dml_acts_waits_current.result
  mysql-test/suite/perfschema/r/dml_acts_waits_history.result
  mysql-test/suite/perfschema/r/dml_acts_waits_history_long.result
  mysql-test/suite/perfschema/r/dml_setup_consumers.result
  mysql-test/suite/perfschema/r/information_schema.result
  mysql-test/suite/perfschema/r/schema.result
  mysql-test/suite/perfschema/r/start_server_off.result
  mysql-test/suite/perfschema/t/dml_acts_waits_current.test
  mysql-test/suite/perfschema/t/dml_acts_waits_history.test
  mysql-test/suite/perfschema/t/dml_acts_waits_history_long.test
  mysql-test/suite/perfschema/t/dml_setup_consumers.test
  storage/perfschema/ha_perfschema.cc
  storage/perfschema/pse.cc
  storage/perfschema/pse_acts_waits.cc
  storage/perfschema/pse_acts_waits.h
  storage/perfschema/pse_bootstrap.cc
  storage/perfschema/pse_sync.cc
  storage/perfschema/pse_sync.h
  storage/perfschema/pse_table.h
  storage/perfschema/table_acts_waits.cc
  storage/perfschema/table_acts_waits.h
  storage/perfschema/table_performance_timers.cc
  storage/perfschema/table_processlist.cc
  storage/perfschema/table_setup_actors.cc
  storage/perfschema/table_setup_consumers.cc
  storage/perfschema/table_setup_instruments.cc
  storage/perfschema/table_setup_timers.cc
  storage/perfschema/table_sync_instances.cc
  storage/perfschema/table_sync_instances.h
  storage/perfschema/table_sync_waits_summary.cc

=== modified file 'include/mysql/mysql_mutex.h'
--- a/include/mysql/mysql_mutex.h	2008-11-26 21:01:51 +0000
+++ b/include/mysql/mysql_mutex.h	2008-11-26 22:45:20 +0000
@@ -160,7 +160,11 @@ struct PSI_cond;
   @c MYSQL_RWLOCK_RDLOCK is a drop in replacement
   for @c pthread_rwlock_rdlock.
 */
-#define MYSQL_RWLOCK_RDLOCK(RW) mysql_rwlock_rdlock(RW,__FILE__,__LINE__)
+#ifdef HAVE_PSI_INTERFACE
+  #define MYSQL_RWLOCK_RDLOCK(RW) mysql_rwlock_rdlock(RW,__FILE__,__LINE__)
+#else
+  #define MYSQL_RWLOCK_RDLOCK(RW) mysql_rwlock_rdlock(RW)
+#endif
 
 /**
   \def MYSQL_RWLOCK_WRLOCK(RW)
@@ -168,7 +172,11 @@ struct PSI_cond;
   @c MYSQL_RWLOCK_WRLOCK is a drop in replacement
   for @c pthread_rwlock_wrlock.
 */
-#define MYSQL_RWLOCK_WRLOCK(RW) mysql_rwlock_wrlock(RW,__FILE__,__LINE__)
+#ifdef HAVE_PSI_INTERFACE
+  #define MYSQL_RWLOCK_WRLOCK(RW) mysql_rwlock_wrlock(RW,__FILE__,__LINE__)
+#else
+  #define MYSQL_RWLOCK_WRLOCK(RW) mysql_rwlock_wrlock(RW)
+#endif
 
 /**
   \def MYSQL_RWLOCK_TRYRDLOCK(RW)
@@ -176,7 +184,11 @@ struct PSI_cond;
   @c MYSQL_RWLOCK_TRYRDLOCK is a drop in replacement
   for @c pthread_rwlock_tryrdlock.
 */
-#define MYSQL_RWLOCK_TRYRDLOCK(RW) mysql_rwlock_tryrdlock(RW,__FILE__,__LINE__)
+#ifdef HAVE_PSI_INTERFACE
+  #define MYSQL_RWLOCK_TRYRDLOCK(RW) mysql_rwlock_tryrdlock(RW,__FILE__,__LINE__)
+#else
+  #define MYSQL_RWLOCK_TRYRDLOCK(RW) mysql_rwlock_tryrdlock(RW)
+#endif
 
 /**
   \def MYSQL_RWLOCK_TRYWRLOCK(RW)
@@ -184,7 +196,11 @@ struct PSI_cond;
   @c MYSQL_RWLOCK_TRYWRLOCK is a drop in replacement
   for @c pthread_rwlock_trywrlock.
 */
-#define MYSQL_RWLOCK_TRYWRLOCK(RW) mysql_rwlock_trywrlock(RW,__FILE__,__LINE__)
+#ifdef HAVE_PSI_INTERFACE
+  #define MYSQL_RWLOCK_TRYWRLOCK(RW) mysql_rwlock_trywrlock(RW,__FILE__,__LINE__)
+#else
+  #define MYSQL_RWLOCK_TRYWRLOCK(RW) mysql_rwlock_trywrlock(RW)
+#endif
 
 /**
   \def MYSQL_RWLOCK_UNLOCK(RW)
@@ -223,7 +239,11 @@ struct PSI_cond;
   @c MYSQL_COND_WAIT is a drop in replacement
   for @c pthread_cond_wait.
 */
-#define MYSQL_COND_WAIT(C,M) mysql_cond_wait(C,M,__FILE__,__LINE__)
+#ifdef HAVE_PSI_INTERFACE
+  #define MYSQL_COND_WAIT(C,M) mysql_cond_wait(C,M,__FILE__,__LINE__)
+#else
+  #define MYSQL_COND_WAIT(C,M) mysql_cond_wait(C,M)
+#endif
 
 /**
   \def MYSQL_COND_TIMEDWAIT(C,M,W)
@@ -231,7 +251,11 @@ struct PSI_cond;
   @c MYSQL_COND_TIMEDWAIT is a drop in replacement
   for @c pthread_cond_timedwait.
 */
-#define MYSQL_COND_TIMEDWAIT(C,M,W) mysql_cond_timedwait(C,M,W,__FILE__,__LINE__)
+#ifdef HAVE_PSI_INTERFACE
+  #define MYSQL_COND_TIMEDWAIT(C,M,W) mysql_cond_timedwait(C,M,W,__FILE__,__LINE__)
+#else
+  #define MYSQL_COND_TIMEDWAIT(C,M,W) mysql_cond_timedwait(C,M,W)
+#endif
 
 /**
   \def MYSQL_COND_SIGNAL(C)