From: Christopher Powers
Date: March 22 2011 3:29pm
Subject: bzr commit into mysql-trunk branch (chris.powers:3271) WL#4896
List-Archive: http://lists.mysql.com/commits/133546
Message-Id: <20110322152934.4EB1D1DB0338@xeno.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5196506096372090554=="

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

#At file:///home/cpowers/work/dev/mysql-trunk-wl4896/ based on revid:chris.powers@stripped

 3271 Christopher Powers	2011-03-22
      WL#4896 "Performance Schema Net IO"
      
      - Correct unittest plan counts

    modified:
      storage/perfschema/unittest/pfs-t.cc
      storage/perfschema/unittest/pfs_instr-oom-t.cc
      storage/perfschema/unittest/pfs_instr-t.cc
      storage/perfschema/unittest/pfs_instr_class-oom-t.cc
      storage/perfschema/unittest/pfs_instr_class-t.cc
=== modified file 'storage/perfschema/unittest/pfs-t.cc'
--- a/storage/perfschema/unittest/pfs-t.cc	2011-03-21 02:01:31 +0000
+++ b/storage/perfschema/unittest/pfs-t.cc	2011-03-22 15:29:28 +0000
@@ -1584,7 +1584,7 @@ void do_all_tests()
 
 int main(int, char **)
 {
-  plan(179);
+  plan(213);
   MY_INIT("pfs-t");
   do_all_tests();
   return 0;

=== modified file 'storage/perfschema/unittest/pfs_instr-oom-t.cc'
--- a/storage/perfschema/unittest/pfs_instr-oom-t.cc	2011-03-21 02:01:31 +0000
+++ b/storage/perfschema/unittest/pfs_instr-oom-t.cc	2011-03-22 15:29:28 +0000
@@ -274,7 +274,7 @@ void do_all_tests()
 
 int main(int, char **)
 {
-  plan(8);
+  plan(9);
   MY_INIT("pfs_instr-oom-t");
   do_all_tests();
   return 0;

=== modified file 'storage/perfschema/unittest/pfs_instr-t.cc'
--- a/storage/perfschema/unittest/pfs_instr-t.cc	2011-03-21 02:01:31 +0000
+++ b/storage/perfschema/unittest/pfs_instr-t.cc	2011-03-22 15:29:28 +0000
@@ -377,7 +377,7 @@ void do_all_tests()
 
 int main(int, char **)
 {
-  plan(91);
+  plan(103);
   MY_INIT("pfs_instr-t");
   do_all_tests();
   return 0;

=== modified file 'storage/perfschema/unittest/pfs_instr_class-oom-t.cc'
--- a/storage/perfschema/unittest/pfs_instr_class-oom-t.cc	2011-03-21 02:01:31 +0000
+++ b/storage/perfschema/unittest/pfs_instr_class-oom-t.cc	2011-03-22 15:29:28 +0000
@@ -59,7 +59,7 @@ void do_all_tests()
 
 int main(int, char **)
 {
-  plan(6);
+  plan(7);
   MY_INIT("pfs_instr_info-oom-t");
   do_all_tests();
   return 0;

=== modified file 'storage/perfschema/unittest/pfs_instr_class-t.cc'
--- a/storage/perfschema/unittest/pfs_instr_class-t.cc	2011-03-21 02:01:31 +0000
+++ b/storage/perfschema/unittest/pfs_instr_class-t.cc	2011-03-22 15:29:28 +0000
@@ -670,7 +670,7 @@ void do_all_tests()
 
 int main(int, char **)
 {
-  plan(146);
+  plan(181);
   MY_INIT("pfs_instr_info-t");
   do_all_tests();
   return 0;


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: chris.powers@stripped
# target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/
# testament_sha1: 2267ef6536a74214c403e365dc4a5dc0f1d2ff17
# timestamp: 2011-03-22 10:29:34 -0500
# source_branch: file:///home/cpowers/work/dev/mysql-trunk/
# base_revision_id: chris.powers@stripped\
#   ek6cl0rcraxi92kl
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWS1mBCMAA9XfgAAQWGP//1ol
yIC////wUAW5e9Huz051nOZUeY3YcEkhBMjTNTVPZGmhT9JPRHlB6gPUZqCSppNPDUyFPKaaZNAA
AAAASKJqZoUxpPSGIAD1AaGg0AIqmphE9qnqaemp6QNpG1NAADNIARSIE9ASaegEap+qeSaaaaGh
6g0yQy248z3zOj1olluzfxEii2YXxaLpyBFSITz0uTJQg0OORGCLEMbbbbb2axbaMQ62bsIEGpUv
e0HMw9u98/Tv9c7I/PjtYiVkT7kOAHdcdLao3Rfus1TklfRM+Ndx7lK9JInx3pP1wyjPZ15J11TI
byQnTBApFxK2qxasezTzc9KYqSWGF2M5aoI9hCwQ3pjhUnJOd3C0QkQE85Tkrxw6HkiElapCkCB4
nscy64slQug2K8CIWjKhxMSZWVlsUJGqBsyGIfOWWzHumxO9FfhtS9hdNBIoNecEUIK6VWQHpJsR
+WFkMnaI3wR2omlMOkgku9TxKEU7MMtPv91u/hoIls9kSKIEfCSao38el/KhJ2ohck1f7JWgQeFV
Bc6mhYrsV1DIXkdcRehIXA1gDMy+ouABQMJJjtHGrI9BaQRTQJFnEJSJIgQI0DLlqmtBOW8hl5gZ
GiuvLRaGEgg3TMS7qnAtVtLD5Y2dDGZTHa6m3DbFo7yZcakjjvHgk9mwWssPE5Jtdb5kR8QjGJXY
MDIeZjaIjDi67PO0a0w3HleFVlB1ZU5JVFFEutG0XGJJYTm0jGCCRnxHEjeVg+onJi45JKNkGaTd
B5nJ1QX0EhSPLC7XXIUlFjJaTKI/K0Shgxm0vdASvk4fWVLGiJTgUomKHgUlYfRK1Zi6V37peNTM
KjKwAl1bc5yO3O0qLSWu/Nrgg8DwNDgbjUjMpS8sil2EpDG2WOgYwllTppgKNMUnS5CqAlU+9GrA
WrcK222zqRpihiLtaMMEkTWJjSZsz20Pa/euBLrFuUoyIsBOAbq8RoFeciALA1l5IW9NvTSIKpCp
4GVaK+IrJOdCFAUFBZZysy0KvyK+Oo4HImviJcigvyOcGNwBP7gc0wgCFbCNDQ0PQzNC8yOFCRp6
o8sCn1n0/3c+4+8YSXtlZi/QZiGIhZ6wnmqhLWW4nVJPuvGwblNMbCzabC9KUeYFCUJUjGstwMLz
MXeVnUg3+g33p7dvVF7mJsKWnzbIOBnPWgsG80eaJdAubqETgelW030vmMMbzGltjEm7eo5tTU/t
xXpF90yTuE9vrHwAuPHbKJvakB6Q+0u1mpjCI4N47AylJRXVC9EeSOaN1jjnakmyQcUdJyAywmzq
wEP25WK2THUmDUcF/epJPqG1WBm2gRoB2W5pbAN8Q1gSXq6sozJx1pBXhVGrkB3fJPtW/EWwLkwh
vmHUbB80gQhNSEjRPPd89nyBKc0tC1OFDfbVUMgiqYzA5pImBOPK9ZA0QiUlk9aZoFpBAVAfCciS
hV4EDAZgyteqKflBJEbIshknCl7I7M2223CQsXoIJovnlvz4yCYqxC01LwV9KFPRkNDt71DFMAxa
tJ2ANRiLKc+qScbuEdBCapMGyq2WS88EuAhOyta/hce+SbikBA3lZLZeB6AxgltdmkJZ0LEmSMyR
2VusT1EqrFlmu8Tvkrd425ndKIXsARAZVzAuWuuNyT05OIXI2ASgO5WNCeSuV9koUldaUpn0o0Vp
CSi5X/F3JFOFCQLWYEIw


--===============5196506096372090554==--