bzr push into mysql-6.0-perf branch (marc.alff:2695 to 2696)

[Marc Alff]

 2696 Marc Alff	2008-10-13
      Missing files in make dist
modified:
  include/Makefile.am

 2695 Marc Alff	2008-10-13
      Instrumentation interface (draft), continued
modified:
  include/Makefile.am
  include/mysql/mysql_mutex.h
  include/mysql/psi.h
  include/mysql/psi_abi_v1.h.pp
  sql/mysqld.cc
  sql/sql_class.cc
  sql/sql_class.h
  storage/perfschema/psm.cc
  storage/perfschema/psm.h
  storage/perfschema/psm_server.cc

=== modified file 'include/Makefile.am'
--- a/include/Makefile.am	2008-10-13 20:42:40 +0000
+++ b/include/Makefile.am	2008-10-13 21:27:25 +0000
@@ -41,7 +41,8 @@ noinst_HEADERS =	config-win.h config-net
 			wqueue.h
 
 EXTRA_DIST =            mysql.h.pp mysql/plugin.h.pp \
-                        mysql/psi_abi_v1.h.pp mysql/psi_abi_v2.h.pp
+                        mysql/psi_abi_v1.h mysql/psi_abi_v1.h.pp \
+                        mysql/psi_abi_v2.h mysql/psi_abi_v2.h.pp
 
 # Remove built files and the symlinked directories
 CLEANFILES =            $(BUILT_SOURCES) readline openssl