From: Marc Alff
Date: November 16 2010 4:44am
Subject: bzr push into mysql-trunk-wl4816 branch (marc.alff:3207 to 3208)
List-Archive: http://lists.mysql.com/commits/123978
Message-Id: <201011160444.oAFJXjvD020893@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3208 Marc Alff	2010-11-16
      Merge cleanup

    modified:
      mysql-test/suite/perfschema/r/ddl_setup_objects.result
      mysql-test/suite/perfschema/t/ddl_setup_objects.test
 3207 Marc Alff	2010-11-15
      Merge cleanup

    modified:
      mysql-test/suite/perfschema/r/ddl_os_global_by_type.result
      mysql-test/suite/perfschema/r/ddl_setup_objects.result
      mysql-test/suite/perfschema/r/dml_os_global_by_type.result
      mysql-test/suite/perfschema/r/dml_setup_objects.result
      mysql-test/suite/perfschema/r/setup_objects.result
      mysql-test/suite/perfschema/r/start_server_no_setup_objects.result
      mysql-test/suite/perfschema/t/ddl_os_global_by_type.test
      mysql-test/suite/perfschema/t/ddl_setup_objects.test
      mysql-test/suite/perfschema/t/dml_os_global_by_type.test
      mysql-test/suite/perfschema/t/dml_setup_objects.test
      mysql-test/suite/perfschema/t/setup_objects.test
      mysql-test/suite/perfschema/t/start_server_no_setup_objects.test
=== modified file 'mysql-test/suite/perfschema/r/ddl_setup_objects.result'
--- a/mysql-test/suite/perfschema/r/ddl_setup_objects.result	2010-11-15 15:04:34 +0000
+++ b/mysql-test/suite/perfschema/r/ddl_setup_objects.result	2010-11-16 04:42:59 +0000
@@ -1,7 +1,7 @@
 alter table performance_schema.setup_objects add column foo integer;
 ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
 drop table if exists test.setup_objects;
-create table test.SETUP_OBJECTS as
+create table test.setup_objects as
 select * from performance_schema.setup_objects;
 truncate table performance_schema.setup_objects;
 select count(*) from performance_schema.setup_objects;

=== modified file 'mysql-test/suite/perfschema/t/ddl_setup_objects.test'
--- a/mysql-test/suite/perfschema/t/ddl_setup_objects.test	2010-11-15 15:04:34 +0000
+++ b/mysql-test/suite/perfschema/t/ddl_setup_objects.test	2010-11-16 04:42:59 +0000
@@ -25,7 +25,7 @@ alter table performance_schema.setup_obj
 drop table if exists test.setup_objects;
 --enable_warnings
 
-create table test.SETUP_OBJECTS as
+create table test.setup_objects as
   select * from performance_schema.setup_objects;
 
 truncate table performance_schema.setup_objects;

No bundle (reason: useless for push emails).