bzr push into mysql-trunk-perfschema branch (marc.alff:2939 to 2940)

[Marc Alff]

 2940 Marc Alff	2009-11-04
      Fixed the start_server_oom test to avoid overflow on 32bit platforms

    modified:
      mysql-test/suite/perfschema/r/start_server_oom.result
      mysql-test/suite/perfschema/t/start_server_oom-master.opt
 2939 Marc Alff	2009-11-03
      Unit tests cleanup

    modified:
      storage/perfschema/unittest/pfs-t.cc
      storage/perfschema/unittest/pfs_timer-t.cc
=== modified file 'mysql-test/suite/perfschema/r/start_server_oom.result'
--- a/mysql-test/suite/perfschema/r/start_server_oom.result	2009-11-03 23:59:45 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_oom.result	2009-11-04 18:41:48 +0000
@@ -42,7 +42,7 @@ performance_schema_events_waits_history_
 performance_schema_events_waits_history_size	10
 performance_schema_max_cond_classes	80
 performance_schema_max_cond_instances	1000
-performance_schema_max_file_classes	999999999999
+performance_schema_max_file_classes	999999999
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200

=== modified file 'mysql-test/suite/perfschema/t/start_server_oom-master.opt'
--- a/mysql-test/suite/perfschema/t/start_server_oom-master.opt	2009-11-03 23:59:45 +0000
+++ b/mysql-test/suite/perfschema/t/start_server_oom-master.opt	2009-11-04 18:41:48 +0000
@@ -1 +1 @@
---enable-performance-schema --performance_schema_max_file_classes=999999999999
+--enable-performance-schema --performance_schema_max_file_classes=999999999


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