From: Marc Alff
Date: June 8 2010 3:47pm
Subject: bzr commit into mysql-next-mr-wl4895 branch (marc.alff:3155)
List-Archive: http://lists.mysql.com/commits/110522
Message-Id: <201006081547.o580IXWB023284@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8054828223338804045=="

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

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

 3155 Marc Alff	2010-06-08
      Fixed the unit tests count

    modified:
      storage/perfschema/unittest/pfs_instr_class-t.cc
=== modified file 'storage/perfschema/unittest/pfs_instr_class-t.cc'
--- a/storage/perfschema/unittest/pfs_instr_class-t.cc	2010-05-07 13:40:54 +0000
+++ b/storage/perfschema/unittest/pfs_instr_class-t.cc	2010-06-08 15:47:12 +0000
@@ -32,7 +32,7 @@ void test_no_registration()
   PFS_cond_class *cond;
   PFS_thread_class *thread;
   PFS_file_class *file;
-  PFS_table_share *table;
+  /* PFS_table_share *table; */
 
   rc= init_sync_class(0, 0, 0);
   ok(rc == 0, "zero init (sync)");
@@ -568,7 +568,7 @@ void do_all_tests()
 
 int main(int, char **)
 {
-  plan(196);
+  plan(170);
   MY_INIT("pfs_instr_info-t");
   do_all_tests();
   return 0;


--===============8054828223338804045==
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:///Users/malff/BZR_TREE/mysql-next-mr-wl4895/
# testament_sha1: fa8408fa6a235ca9d6e7cdb5d2ace3e6bd5f76cd
# timestamp: 2010-06-08 09:47:20 -0600
# source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@stripped\
#   ynmvfwe713m4kp15
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWUMfFgIAAYHfgAAQUHP//3MC
SAC////wUANXeAA5AA0KAmmajQaek2ozUyAAGgaEU9IJ6noTaTTJiGAEYT1MjBMYaGgAAA0AAAAA
RT9SjE0ep6JghoxNDAABDTCSQTTQEyZDKntJPQU9PUNTTNE2mjPUzpEHmDmRsAIyJkgBtdN5ToqQ
ogVipo9JREUkWgH5TiQJBgDAhQrzyPbpWjMMAkAtqsLZ2F+qntIwSJs/lSDYV1R6iOPN6ZXiqoPX
8Z8eG9XzrSJrekctxbXDK8ilr5OchdLEK1Oe9OTWlJScpOZB991IqVqqE6pbFLrBRtHO5xQvPkVa
QTn0imoUNXiVdSQfQ3qS/NfcJyqt83dsNtMSzjxP4uDoi1+aE4MV5c4aVUrdpylRcV44XVogEpmX
6FbHV3PGuI9qyBXAoWkDne8t2qVlde9QN5BypNiwyuioqYqSBtM3kik1sia42eK0gKjPdStzJ0M7
wvlG8VTy/OCyli/fMRJ0lMZR3mVxbWnHeqMCkVli0ebcZ8ZxLLFTywbHqKm4WXBk5WwsrdY8wwJL
jcZGHG5ioqK+Qq+l8bVi+WD7Goii55Icmk0SIUSbtV2LtH1Z5vY089tEidFTDDfZvxsR+/VW0X9k
4G+b3t6+yOBEOBn4Qd76zNfpekW2XPDskfHCffHw/XNIytRQnr9/5445YvONj2PhxF0Ru7KackeB
2h2OSquKD+ctIt7JyRJIv78D6rDa6GRXdapJnqJ3HBU1AftzM0LQAjnlYad63LifCQWNx17wj0YB
yQti6p0Fl9JTOkFROqE3vaCYbiMqcsedrEW6ZwAKQnF9hFVU6QWoKo/ff42MeV6bFePJGYtjNGUm
XcrAoecFb8PNN4x4macY+oV0r853w3BkF3kubv9jr8hOXEtDvXy99AskE3htNdGSGpZvfoCx9J3i
PmmzD1PyM7l1VT7TlTCB10TqIRICY2fAH0Oa46r0FBcCDJzJl1toFwBQD5QPdI8AktXK2nHwWG9m
TyPDg0Z4S7tuFWSuViS2iIKedhI+MlS62EAhXinOhM0ak4g32Ul5a3zYaoaYc050Kox+1jzmqIxP
a6h8LTFdWrU8elxUE0yZnuVBhvnrOnQVK0WQUr2WfotPQXoLdSGC3/Ga6CthIl9V/RdyRThQkEMf
FgI=


--===============8054828223338804045==--