bzr push into mysql-next-mr branch (marc.alff:3150 to 3151)

[Marc Alff]

 3151 Marc Alff	2010-06-14
      Fixed unit tests (missing initialization for m_setup_actor_sizing)

    modified:
      storage/perfschema/unittest/pfs-t.cc
      storage/perfschema/unittest/pfs_instr-oom-t.cc
      storage/perfschema/unittest/pfs_instr-t.cc
 3150 Marc Alff	2010-06-03
      Fixed the main.information_schema test case to be more reliable,
      and insensitive to build with / without the performance schema.

    modified:
      mysql-test/r/information_schema.result
      mysql-test/t/information_schema.test
=== modified file 'storage/perfschema/unittest/pfs-t.cc'
--- a/storage/perfschema/unittest/pfs-t.cc	2010-05-03 15:04:02 +0000
+++ b/storage/perfschema/unittest/pfs-t.cc	2010-06-14 07:06:59 +0000
@@ -94,6 +94,7 @@ void test_bootstrap()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   boot= initialize_performance_schema(& param);
   ok(boot != NULL, "boot");
@@ -136,6 +137,7 @@ PSI * load_perfschema()
   param.m_file_handle_sizing= 50;
   param.m_events_waits_history_sizing= 10;
   param.m_events_waits_history_long_sizing= 10;
+  param.m_setup_actor_sizing= 0;
 
   /* test_bootstrap() covered this, assuming it just works */
   boot= initialize_performance_schema(& param);

=== modified file 'storage/perfschema/unittest/pfs_instr-oom-t.cc'
--- a/storage/perfschema/unittest/pfs_instr-oom-t.cc	2010-05-03 15:04:02 +0000
+++ b/storage/perfschema/unittest/pfs_instr-oom-t.cc	2010-06-14 07:06:59 +0000
@@ -45,6 +45,7 @@ void test_oom()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 1, "oom (mutex)");
@@ -65,6 +66,7 @@ void test_oom()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 1, "oom (rwlock)");
@@ -85,6 +87,7 @@ void test_oom()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 1, "oom (cond)");
@@ -105,6 +108,7 @@ void test_oom()
   param.m_file_handle_sizing= 1000;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 1, "oom (file)");
@@ -125,6 +129,7 @@ void test_oom()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 1, "oom (table)");
@@ -145,6 +150,7 @@ void test_oom()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 1, "oom (thread)");
@@ -167,6 +173,7 @@ void test_oom()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 10;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   stub_alloc_fails_after_count= 2;
   rc= init_instruments(& param);
@@ -188,6 +195,7 @@ void test_oom()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   stub_alloc_fails_after_count= 2;
   rc= init_instruments(& param);

=== modified file 'storage/perfschema/unittest/pfs_instr-t.cc'
--- a/storage/perfschema/unittest/pfs_instr-t.cc	2010-05-03 15:04:02 +0000
+++ b/storage/perfschema/unittest/pfs_instr-t.cc	2010-06-14 07:06:59 +0000
@@ -43,6 +43,7 @@ void test_no_instruments()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 0, "zero init");
@@ -83,6 +84,7 @@ void test_no_instances()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 0;
   param.m_events_waits_history_long_sizing= 0;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 0, "no instances init");
@@ -196,6 +198,7 @@ void test_with_instances()
   param.m_file_handle_sizing= 100;
   param.m_events_waits_history_sizing= 10;
   param.m_events_waits_history_long_sizing= 10000;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 0, "instances init");
@@ -355,6 +358,7 @@ void test_per_thread_wait()
   param.m_file_handle_sizing= 0;
   param.m_events_waits_history_sizing= 10;
   param.m_events_waits_history_long_sizing= 10000;
+  param.m_setup_actor_sizing= 0;
 
   rc= init_instruments(& param);
   ok(rc == 0, "instances init");


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