bzr push into mysql-5.4-perfschema branch (marc.alff:2820 to 2821)

[Marc Alff]

 2821 Marc Alff	2009-07-09
      Pushbuild cleanup
      modified:
        mysql-test/include/default_my.cnf
        mysql-test/include/default_mysqld.cnf
        regex/Makefile.am

 2820 Marc Alff	2009-07-09
      Removed dead code from the build
      modified:
        regex/Makefile.am

=== modified file 'mysql-test/include/default_my.cnf'
--- a/mysql-test/include/default_my.cnf	2009-07-08 23:52:29 +0000
+++ b/mysql-test/include/default_my.cnf	2009-07-09 20:36:37 +0000
@@ -9,7 +9,7 @@
 log-bin=                 master-bin
 
 # Run tests with the performance schema instrumentation
-enable-performance-schema
+loose-enable-performance-schema
 
 [mysqlbinlog]
 disable-force-if-open

=== modified file 'mysql-test/include/default_mysqld.cnf'
--- a/mysql-test/include/default_mysqld.cnf	2009-07-08 23:52:29 +0000
+++ b/mysql-test/include/default_mysqld.cnf	2009-07-09 20:36:37 +0000
@@ -23,5 +23,5 @@ log-bin=mysqld-bin
 disable-sync-frm
 
 # Run tests with the performance schema instrumentation
-enable-performance-schema
+loose-enable-performance-schema
 

=== modified file 'regex/Makefile.am'
--- a/regex/Makefile.am	2009-07-09 19:38:59 +0000
+++ b/regex/Makefile.am	2009-07-09 20:36:37 +0000
@@ -22,7 +22,8 @@ noinst_HEADERS =	cclass.h cname.h regex2
 libregex_a_SOURCES =	regerror.c regcomp.c regexec.c regfree.c reginit.c
 EXTRA_DIST =		tests CHANGES COPYRIGHT WHATSNEW regexp.c \
 			debug.ih engine.ih main.ih regcomp.ih regerror.ih \
-			regex.3 regex.7 CMakeLists.txt
+			regex.3 regex.7 CMakeLists.txt \
+			split.c debug.c main.c
 
 # Removed 're' from the build:
 # - this binary does not link on Solaris 10 with SunStudio