From: Marc Alff
Date: October 25 2010 1:02pm
Subject: bzr commit into mysql-next-mr-wl4816 branch (marc.alff:3204)
List-Archive: http://lists.mysql.com/commits/121814
Message-Id: <201010251304.o9PBbtvC022054@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0666602800837976406=="

--===============0666602800837976406==
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-wl4816/ based on revid:marc.alff@stripped

 3204 Marc Alff	2010-10-25
      Misc cleanup

    modified:
      storage/perfschema/pfs.cc
      storage/perfschema/unittest/pfs-t.cc
=== modified file 'storage/perfschema/pfs.cc'
--- a/storage/perfschema/pfs.cc	2010-09-24 21:04:59 +0000
+++ b/storage/perfschema/pfs.cc	2010-10-25 13:02:25 +0000
@@ -487,7 +487,7 @@ static inline int mysql_mutex_lock(...)
   Applying this function to our point P gives another point P':
 
   F_i (P):
-  P(x1, x2, ..., x{i-1}, x_i, x{i+1}, ..., x_N
+  P(x1, x2, ..., x{i-1}, x_i, x{i+1}, ..., x_N)
   --> P' (x1, x2, ..., x{i-1}, f_i(x_i), x{i+1}, ..., x_N)
 
   That function defines in fact an aggregate !

=== modified file 'storage/perfschema/unittest/pfs-t.cc'
--- a/storage/perfschema/unittest/pfs-t.cc	2010-09-23 16:08:54 +0000
+++ b/storage/perfschema/unittest/pfs-t.cc	2010-10-25 13:02:25 +0000
@@ -384,7 +384,7 @@ void test_bad_registration()
   ok(dummy_thread_key == 0, "zero key");
   dummy_thread_key= 9999;
   psi->register_thread("12345678901234567890123", bad_thread_1, 1);
-  ok(dummy_thread_key == 2, "assigned key");
+  ok(dummy_thread_key == 1, "assigned key");
 
   /*
     Test that length('thread/' (7) + category + '/' (1) + name) <= 128
@@ -420,7 +420,7 @@ void test_bad_registration()
   ok(dummy_thread_key == 0, "zero key");
 
   psi->register_thread("X", bad_thread_3, 1);
-  ok(dummy_thread_key == 3, "assigned key");
+  ok(dummy_thread_key == 2, "assigned key");
 
   /*
     Test that length('wait/io/file/' (13) + category + '/' (1)) < 32
@@ -1380,7 +1380,7 @@ void do_all_tests()
 
 int main(int, char **)
 {
-  plan(180);
+  plan(179);
   MY_INIT("pfs-t");
   do_all_tests();
   return 0;


--===============0666602800837976406==
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-wl4816/
# testament_sha1: 2ebed8a011dd5890f92df765eaf65f8e432fdfc9
# timestamp: 2010-10-25 15:02:50 +0200
# source_branch: file:///Users/malff/BZR_TREE/mysql-next-mr/
# base_revision_id: marc.alff@stripped\
#   ux3j0smzpwi1dltr
# 
# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWQmhZuIAAkjfgAAQUG///3ID
QAC////6UARNt7rrTTLqKLdrgkkjUyaMjJmp6gTFPAmo8ieUGjaCSghqbQ00k8iD1NAGmgAAAkUm
JNNE9TanpPKaAGgZGQaABgAAAANAAAAAAkkTJkMqbI1GMppHqNDTNQAGRXTFQU/tC7gQv2pUSTzY
BK0dfe5sr5XugwZChis4Exg2N7daW6NPM4ZnkeSUKIwbItOD1fZXg9Ztjeryk9mjWJYIs16pWE9V
MRrrDBD7BqDGQ7du37pkcNflnfaSV1juuiQPCEyLQOIsNl6RvHfL/HrTUEDPhoJW3pjtEolL3mhg
oAdTAzd2bmQdYIYSqLCEKBTKFMBiGPlPV4xUmMMU1XGCv3LKI1Rd59shMwB0sTgGLtCnbgRQXUTo
ReLaXRjZbwfXQ4CJ5qkHi+I9RlbYEO+Bx2mx21MKi04DIVWKsaviB8uGy1t06QSDAXw1/czfbrpI
2gSO6R3Cc94ERGgsrMWESOEIyE0WjxoIVN0IM5DSMxVQGWnAmBQ61IWASSdIy22yIimBrKUGIHJb
vPGMdrq7bgM3OArUqj1QkuLEyI97TsKz2GMDqIkdDIJuT4VCqqxkTa9xfAJV6Y59Ir6S0ZQqK27G
GWGAPLyhGZsAsmQHAZW4MR2NuMyRWr7mLy2t0Xxm1cuormUEz3uMmmMQMwMcQOzTDdiFDsszxGZ1
aXFxVayVuYgVQyOXA5zFTQpEAdLkpInS9i2KzyNFlbfcaCgamZ/Q14CUZ1jGx+8OI+ZdJhWI1ByP
LpYHQrpxJRFyccgMzgWG5a+nLp7xLJWORzEuVxdufNb8QEsCWscuHKw3xZQzj+bz527kGPZE1YGQ
8SmXtk7eLX00wnx0pc5hLncJW8RHxFXPPKQoB4NKig6bSGUaFF7Sq1f9vc2CC7MfOi9jdn0GCYCt
r3U3m0sjvYdjMSKjjIoZhyKhsUOM7Xek+em5t3w4xULemCa62rY2rLK0yKpEfkJYwKsZdcZS0iak
AJCUdRxay4JJ5sX9OZ3mTGmYZsO5cxTVJET3RA36hUpeerP7pvGnGWUToa9sVR2iKUu2Ixc42yX0
dt6Mgt1bzV0ThZug1xjGRGIYJkX5IsvTSUCTA2sDzrSVvr1wa21rIJU5kdz3TDtNipJKzjOhCCpA
duVsLUbxz0dCyT2nUT2CLl4c4AU4VmCSpR4yP4S0oqXJBWYXV3MYQW9fNl7bnVKnKtGertxtyVyQ
PekpG0Y1KOclA5Lq1B19Dw0hRdk+F4cZkSKHHkKQcvFeF2I2A2An39/2q8xFCBAHssMA1zFMhhna
VoioJj2BAwvYcPcBRCanzPWRFTsq/opvX78hQ2pigTDGRhjYa2jBPkUzxQ0HY+hdyRThQkAmhZuI


--===============0666602800837976406==--