From: Marc Alff
Date: March 8 2011 5:26pm
Subject: bzr commit into mysql-trunk branch (marc.alff:3735)
List-Archive: http://lists.mysql.com/commits/132619
Message-Id: <201103081727.p28GpIfr027390@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

#At file:///Users/malff/BZR_TREE/mysql-trunk/ based on revid:davi.arnaut@stripped

 3735 Marc Alff	2011-03-08 [merge]
      Merge mysql-5.5 --> mysql-trunk

    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
      storage/perfschema/unittest/pfs_timer-t.cc
=== modified file 'storage/perfschema/unittest/pfs-t.cc'
--- a/storage/perfschema/unittest/pfs-t.cc	2010-12-02 15:05:07 +0000
+++ b/storage/perfschema/unittest/pfs-t.cc	2011-03-08 17:24:34 +0000
@@ -1370,6 +1370,8 @@ void test_event_name_index()
 
 void do_all_tests()
 {
+  /* Using initialize_performance_schema(), no partial init needed. */
+
   test_bootstrap();
   test_bad_registration();
   test_init_disabled();

=== modified file 'storage/perfschema/unittest/pfs_instr-oom-t.cc'
--- a/storage/perfschema/unittest/pfs_instr-oom-t.cc	2010-12-02 15:05:07 +0000
+++ b/storage/perfschema/unittest/pfs_instr-oom-t.cc	2011-03-08 17:24:34 +0000
@@ -224,7 +224,11 @@ void test_oom()
 
 void do_all_tests()
 {
+  PFS_atomic::init();
+
   test_oom();
+
+  PFS_atomic::cleanup();
 }
 
 int main(int, char **)

=== modified file 'storage/perfschema/unittest/pfs_instr-t.cc'
--- a/storage/perfschema/unittest/pfs_instr-t.cc	2010-12-02 15:05:07 +0000
+++ b/storage/perfschema/unittest/pfs_instr-t.cc	2011-03-08 17:24:34 +0000
@@ -333,9 +333,13 @@ void test_with_instances()
 
 void do_all_tests()
 {
+  PFS_atomic::init();
+
   test_no_instruments();
   test_no_instances();
   test_with_instances();
+
+  PFS_atomic::cleanup();
 }
 
 int main(int, char **)

=== modified file 'storage/perfschema/unittest/pfs_instr_class-oom-t.cc'
--- a/storage/perfschema/unittest/pfs_instr_class-oom-t.cc	2010-12-02 15:05:07 +0000
+++ b/storage/perfschema/unittest/pfs_instr_class-oom-t.cc	2011-03-08 17:24:34 +0000
@@ -47,7 +47,11 @@ void test_oom()
 
 void do_all_tests()
 {
+  PFS_atomic::init();
+
   test_oom();
+
+  PFS_atomic::cleanup();
 }
 
 int main(int, char **)

=== modified file 'storage/perfschema/unittest/pfs_instr_class-t.cc'
--- a/storage/perfschema/unittest/pfs_instr_class-t.cc	2010-12-02 15:05:07 +0000
+++ b/storage/perfschema/unittest/pfs_instr_class-t.cc	2011-03-08 17:24:34 +0000
@@ -566,6 +566,8 @@ void test_instruments_reset()
 
 void do_all_tests()
 {
+  PFS_atomic::init();
+
   test_no_registration();
   test_mutex_registration();
   test_rwlock_registration();
@@ -574,6 +576,8 @@ void do_all_tests()
   test_file_registration();
   test_table_registration();
   test_instruments_reset();
+
+  PFS_atomic::cleanup();
 }
 
 int main(int, char **)

=== modified file 'storage/perfschema/unittest/pfs_timer-t.cc'
--- a/storage/perfschema/unittest/pfs_timer-t.cc	2010-07-16 01:28:30 +0000
+++ b/storage/perfschema/unittest/pfs_timer-t.cc	2011-03-08 17:24:34 +0000
@@ -105,7 +105,11 @@ void test_timers()
 
 void do_all_tests()
 {
+  PFS_atomic::init();
+
   test_timers();
+
+  PFS_atomic::cleanup();
 }
 
 int main(int, char **)

No bundle (reason: revision is a merge).