bzr push into mysql-next-mr-bugfixing branch (marc.alff:3307 to 3308)

[Marc Alff]

 3308 Marc Alff	2010-09-29
      Merge cleanup

    modified:
      mysql-test/suite/perfschema/r/privilege_table_io.result
      mysql-test/suite/perfschema/r/start_server_no_setup_actors.result
 3307 Tor Didriksen	2010-09-29 [merge]
      Merge next-mr-opt-team => next-mr-bugfixing

    modified:
      sql/sql_select.cc
      sql/sql_select.h
=== modified file 'mysql-test/suite/perfschema/r/privilege_table_io.result'
--- a/mysql-test/suite/perfschema/r/privilege_table_io.result	2010-09-09 21:15:04 +0000
+++ b/mysql-test/suite/perfschema/r/privilege_table_io.result	2010-09-29 15:29:14 +0000
@@ -31,6 +31,7 @@ performance_schema_max_table_handles	100
 performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	1000
+performance_schema_setup_actors_size	100
 show status like "performance_schema%";
 Variable_name	Value
 Performance_schema_cond_classes_lost	0

=== modified file 'mysql-test/suite/perfschema/r/start_server_no_setup_actors.result'
--- a/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result	2010-09-01 22:59:33 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_no_setup_actors.result	2010-09-29 15:29:14 +0000
@@ -46,11 +46,11 @@ performance_schema_max_file_classes	50
 performance_schema_max_file_handles	32768
 performance_schema_max_file_instances	10000
 performance_schema_max_mutex_classes	200
-performance_schema_max_mutex_instances	1000000
+performance_schema_max_mutex_instances	10000
 performance_schema_max_rwlock_classes	30
-performance_schema_max_rwlock_instances	1000000
-performance_schema_max_table_handles	10000
-performance_schema_max_table_instances	1000
+performance_schema_max_rwlock_instances	10000
+performance_schema_max_table_handles	1000
+performance_schema_max_table_instances	500
 performance_schema_max_thread_classes	50
 performance_schema_max_thread_instances	1000
 performance_schema_setup_actors_size	0


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