bzr commit into mysql-next-mr branch (marc.alff:3171) WL#4674

[Marc Alff]

#At file:///home/malff/BZR_TREE/mysql-next-mr-wl4674/ based on revid:marc.alff@stripped

 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
=== 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/[e-mail]