List:Commits« Previous MessageNext Message »
From:Marc Alff Date:September 7 2010 6:34pm
Subject:bzr push into mysql-next-mr branch (marc.alff:3170 to 3171) WL#4674
View as plain text  
 3171 Marc Alff	2010-09-07
      WL#4674 PERFORMANCE SCHEMA SETUP_ACTORS
      
      Disabled two new performance schema tests for the windows platform,
      because the expected result there is different.
      
      This is expected, as the instrumented thread names are different on this platform.

    modified:
      mysql-test/suite/perfschema/t/setup_actors.test
      mysql-test/suite/perfschema/t/threads_mysql.test
 3170 Marc Alff	2010-09-01
      Fixed the tests for lc1 and lc2 platforms

    modified:
      mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc2.result
      mysql-test/suite/perfschema/r/schema_lc1.result
      mysql-test/suite/perfschema/r/schema_lc2.result
      mysql-test/suite/perfschema/t/setup_actors.test
=== modified file 'mysql-test/suite/perfschema/t/setup_actors.test'
--- a/mysql-test/suite/perfschema/t/setup_actors.test	2010-09-02 00:00:20 +0000
+++ b/mysql-test/suite/perfschema/t/setup_actors.test	2010-09-07 18:33:49 +0000
@@ -18,6 +18,7 @@
 # The checks for indirect activity caused by users, system threads etc.
 # are within setup_actors1.test.
 
+--source include/not_windows.inc
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 

=== modified file 'mysql-test/suite/perfschema/t/threads_mysql.test'
--- a/mysql-test/suite/perfschema/t/threads_mysql.test	2010-07-29 18:00:27 +0000
+++ b/mysql-test/suite/perfschema/t/threads_mysql.test	2010-09-07 18:33:49 +0000
@@ -18,6 +18,7 @@
 #
 # Show MySQL server related content in performance_schema.THREADS
 
+--source include/not_windows.inc
 --source include/not_embedded.inc
 --source include/have_perfschema.inc
 


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20100907183349-5c2hhm3xt10dboo0.bundle
Thread
bzr push into mysql-next-mr branch (marc.alff:3170 to 3171) WL#4674Marc Alff7 Sep