From: Marc Alff
Date: September 7 2010 6:33pm
Subject: bzr commit into mysql-next-mr branch (marc.alff:3171) WL#4674
List-Archive: http://lists.mysql.com/commits/117723
Message-Id: <20100907183355.BC6E345E80@linux-su11.site>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2423302293128067397=="

--===============2423302293128067397==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

#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
 


--===============2423302293128067397==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/marc.alff@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: marc.alff@stripped
# target_branch: file:///home/malff/BZR_TREE/mysql-next-mr-wl4674/
# testament_sha1: 0b227ade564ecc3ab01c0e4a74f18b0892735747
# timestamp: 2010-09-07 12:33:55 -0600
# source_branch: file:///home/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@stripped\
#   akqn9tertwxj5w13
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWTugJ5IAAjRfgEAQWGf/939H
3oC////wUATXd4AOm8y6yvWtGElJoE0myaT0yaNE9TGiDaIGmgAGglTUGp6ZDU9JpPU8kwgAaZGR
iNAAGpqZMo0aDI0PUANBoANAGmR6gJTSqflTeplGnqMh6m1MR6gGQAekxMQASSCA0FPCZNJgqfqa
mj01HlPUAaDNIODpc8t0CHoupK18NaiRILoKkBU65ELJpbJIo5qh5ESEGexjXDZEMtxJyR7Sq6K9
d2x0kLP++8AhvB11ZkBiQk5ldmgGkJVAoNvPruqD4QbLBEYHIwG6FuV3kdD2JCihdN57HQC0M5z5
1Hyo8jQhvnsqr7IUtkLgrWTGZC2IUC5nu4cRqEDhhnwTge4iA8IG9kB4PSCA9wxyuCGJMOHnJVlB
KAEUz3ApyIPpVDARat50PlaihigafrSkHnWYnTUDlTOQjSUQyxvxlqdg9TIGpPazF5Ual5qeLWAc
tMdT5tuO4fbI106nFnUu2DHzBgekEiox+2cjJO4FeRn2JbizS96jo0kTI6F5WUy5DzkBqRKLI2jM
PKbKgL7QJ2eXDbbRKQ7ATZjyAwaXDOu3VzDzuGIjEV6cXGRTeBoOoHYKF00txvO8wM9SswoLw1iO
vM8GILIwJAQu+h9AfnOOYtedbmKyKsfDUgaRN05N3YBIhAMZFJTUDyU4DhkxQXkU1oZhjsDi4ZG0
RltdEoDyaEpHQMXS4mka148B0QoGA4PTiBA7qY2mAYVjq9cjeSleQmPAJTXJ05J9trTTIa16iOBp
2goomnbxXDwoNSRm5kRPRhazA0XhhUZ7oIxEXCTnGjumSVMzbHDwuTfKTFME5Aidkgivb1jlqGC8
goaKmsaLaaiuzOcznG7H3oXOpERHS+8jtDehWzKaZ+GxqFVGkyFpaMNuI3T7JzcW17XvAkc/iZk6
WQlsbAXkrPUuL5+hApK/wsduOP4mT2QoDziJYyIrUc5gypgafEausJgzcz0fncBIcmVZSFNUHDlw
5C+ONcla6kqjfi9dUNx0acJjWaC7nuVFSTqHPRWAdwD2jEputglVl6N/Kmb5iIQUV9aogxUSv0E1
LHQuZGOCYy48mIlqGOoeh0y1DlhdJ885ChP48OMEbCVCPY4mBUYOwMXFpjaLuOSzFQiZ7sgG8m1A
YLUd7iJaWzRc/x+CGn7HJGgnmPvGNSPdSN/KZncKHjAf2lGN4y8QzmQjGGA+qEZg2BUE9aK3h9Z5
HYkhMHu2/aQlpOVUHXmhNqA8fZC+Gk1Mh8EGfaJ09BVVPGLVqlrUSSpBNhaBIQh76HsrB1yBmBlw
2nA9C/0MklXQj7uAExV/yFYhwTFmYtZerNapoUdLBgNWkbAwifftJCIOgNqa9U4QTQEqRofDqDns
wrJdnKBzqFi696gzBB2ek2FxqZxUtvtGN2eVFyvCnbFQW2ETNOoHSEwE6NnHe++HuvLBgf3swEXD
gyIO5waz1D3izRXUcx4TMSzaNmlxcixWg4g4N0+CriFhkZ3n3nWU7YJryS8y5Wokzwt3nQjVSmDv
CheoDIsyGHZLoC/OoP8XckU4UJA7oCeS


--===============2423302293128067397==--