bzr commit into mysql-6.0-perf branch (marc.alff:2708)

[Marc Alff]

#At file:///home/malff/BZR-TREE/mysql-6.0-perf/

 2708 Marc Alff	2008-10-16
      Fixed make dist
modified:
  BUILD/compile-dist
  sql/Makefile.am
  sql/mysqld.cc

=== modified file 'BUILD/compile-dist'
--- a/BUILD/compile-dist	2008-05-29 15:44:11 +0000
+++ b/BUILD/compile-dist	2008-10-16 21:34:55 +0000
@@ -44,5 +44,6 @@ fi
   --with-maria-storage-engine \
   --with-embedded-server \
   --with-falcon \
+  --with-perfschema-storage-engine \
   --with-ndbcluster
 make

=== modified file 'sql/Makefile.am'
--- a/sql/Makefile.am	2008-09-16 08:34:30 +0000
+++ b/sql/Makefile.am	2008-10-16 21:34:55 +0000
@@ -135,7 +135,7 @@ mysqld_SOURCES =	sql_lex.cc sql_handler.
 			sql_plugin.cc sql_binlog.cc \
 			sql_builtin.cc sql_tablespace.cc partition_info.cc \
 			sql_servers.cc sql_audit.cc sha2.cc \
-			ddl_blocker.cc si_objects.cc si_logs.cc \ 
+			ddl_blocker.cc si_objects.cc si_logs.cc \
 			event_parse_data.cc mdl.cc transaction.cc
 
 if HAVE_DTRACE

=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2008-10-16 00:25:49 +0000
+++ b/sql/mysqld.cc	2008-10-16 21:34:55 +0000
@@ -8726,7 +8726,14 @@ static void set_server_version(void)
     end= strmov(end, "-debug");
 #endif
   if (opt_log || opt_update_log || opt_slow_log || opt_bin_log)
-    strmov(end, "-log");                        // This may slow down system
+    end= strmov(end, "-log");                        // This may slow down system
+#ifdef HAVE_PSI_INTERFACE
+#ifdef HAVE_PERFORMANCE_SCHEMA
+  end= strmov(end, "-perfschema");
+#else
+  end= strmov(end, "-psi");
+#endif
+#endif
 }