bzr push into mysql-next-mr-wl4816 branch (marc.alff:3203 to 3204)

[Marc Alff]

 3204 Marc Alff	2010-10-25
      Misc cleanup

    modified:
      storage/perfschema/pfs.cc
      storage/perfschema/unittest/pfs-t.cc
 3203 Marc Alff	2010-10-11
      Reordered the code to discard incomplete records first,
      instead of using un initialized memory and then discard records.

    modified:
      storage/perfschema/table_events_waits.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;


Attachment: [text/bzr-bundle] bzr/[e-mail]