List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:March 11 2011 10:13pm
Subject:bzr push into mysql-trunk branch (chris.powers:3249 to 3253) WL#4896
View as plain text  
 3253 cpowers	2011-03-11
      WL#4896 "Performance Schema Net IO"
      
      Resolved test failures caused when performance_schema_max_sockets was
      renamed to performance_schema_max_socket_instances:
      - Renamed sys_vars.pfs_max_socket to sys_vars.pfs_max_socket_instances
      - Re-record mysqld--help-win.result

    renamed:
      mysql-test/suite/sys_vars/r/pfs_max_sockets_basic.result => mysql-test/suite/sys_vars/r/pfs_max_socket_instances_basic.result
      mysql-test/suite/sys_vars/t/pfs_max_sockets_basic-master.opt => mysql-test/suite/sys_vars/t/pfs_max_socket_instances_basic-master.opt
      mysql-test/suite/sys_vars/t/pfs_max_sockets_basic.test => mysql-test/suite/sys_vars/t/pfs_max_socket_instances_basic.test
    modified:
      mysql-test/r/mysqld--help-win.result
      mysql-test/suite/sys_vars/r/all_vars.result
 3252 cpowers	2011-03-11 [merge]
      merge

    modified:
      mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
 3251 cpowers	2011-03-11
      WL#4896 "Performance Schema Net IO"
      
      - Re-recorded perfschema.pfs_upgrade_lc1.result

    modified:
      mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
 3250 cpowers	2011-03-11
      WL#4896 "Performance Schema Net IO"
      
      - Fixed bug in register_socket_class() that caused perfschema.aggregate to fail

    modified:
      storage/perfschema/pfs_instr_class.cc
 3249 Christopher Powers	2011-03-10
      WL#4896 "Performance Schema Net IO"
      
      - Removed unused parameters from mysql_socket_accept()

    modified:
      include/mysql/psi/mysql_socket.h
=== modified file 'mysql-test/r/mysqld--help-win.result'
--- a/mysql-test/r/mysqld--help-win.result	2011-02-22 05:37:44 +0000
+++ b/mysql-test/r/mysqld--help-win.result	2011-03-11 20:47:31 +0000
@@ -448,6 +448,10 @@ The following options may be given as th
  Maximum number of rwlock instruments.
  --performance-schema-max-rwlock-instances=# 
  Maximum number of instrumented RWLOCK objects.
+ --performance-schema-max-socket-classes=# 
+ Maximum number of socket instruments.
+ --performance-schema-max-socket-instances=# 
+ Maximum number of opened instrumented sockets.
  --performance-schema-max-table-handles=# 
  Maximum number of opened instrumented tables.
  --performance-schema-max-table-instances=# 
@@ -899,6 +903,8 @@ performance-schema-max-mutex-classes 200
 performance-schema-max-mutex-instances 1000000
 performance-schema-max-rwlock-classes 30
 performance-schema-max-rwlock-instances 1000000
+performance-schema-max-socket-classes 50
+performance-schema-max-socket-instances 10000
 performance-schema-max-table-handles 10000
 performance-schema-max-table-instances 1000
 performance-schema-max-thread-classes 50

=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result	2011-02-28 16:24:05 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result	2011-03-11 20:17:01 +0000
@@ -19,22 +19,22 @@ ERROR 1050 (42S01) at line 186: Table 'f
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 676: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 628: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -58,22 +58,22 @@ ERROR 1050 (42S01) at line 186: Table 'f
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 676: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 628: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -95,22 +95,22 @@ ERROR 1050 (42S01) at line 186: Table 'f
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 676: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 628: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -132,22 +132,22 @@ ERROR 1050 (42S01) at line 186: Table 'f
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 676: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 628: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -169,22 +169,22 @@ ERROR 1050 (42S01) at line 186: Table 'f
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 676: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 628: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result	2011-02-25 23:53:35 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result	2011-03-11 20:14:48 +0000
@@ -19,22 +19,22 @@ ERROR 1050 (42S01) at line 186: Table 'f
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 676: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 628: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -58,22 +58,22 @@ ERROR 1050 (42S01) at line 186: Table 'f
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 676: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 628: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -95,22 +95,22 @@ ERROR 1050 (42S01) at line 186: Table 'f
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 676: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 628: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -132,22 +132,22 @@ ERROR 1050 (42S01) at line 186: Table 'f
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 676: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 628: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -169,22 +169,22 @@ ERROR 1050 (42S01) at line 186: Table 'f
 ERROR 1050 (42S01) at line 197: Table 'file_summary_by_event_name' already exists
 ERROR 1050 (42S01) at line 209: Table 'file_summary_by_instance' already exists
 ERROR 1050 (42S01) at line 221: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 312: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 401: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 410: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 424: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 434: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 444: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 453: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 461: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 470: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 480: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 488: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 533: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 577: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 656: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 676: Table 'threads' already exists
-ERROR 1644 (HY000) at line 1096: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 288: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 353: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 362: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 376: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 386: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 396: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 405: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 413: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 422: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 432: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 440: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 485: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 529: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 608: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 628: Table 'threads' already exists
+ERROR 1644 (HY000) at line 1048: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

=== modified file 'mysql-test/suite/sys_vars/r/all_vars.result'
--- a/mysql-test/suite/sys_vars/r/all_vars.result	2011-02-28 16:24:05 +0000
+++ b/mysql-test/suite/sys_vars/r/all_vars.result	2011-03-11 20:47:31 +0000
@@ -17,7 +17,6 @@ INNODB_ROLLBACK_SEGMENTS
 INNODB_STATS_PERSISTENT_SAMPLE_PAGES
 RELAY_LOG_BASENAME
 LOG_BIN_BASENAME
-PFS_MAX_SOCKET_INSTANCES
 INNODB_MONITOR_RESET
 INNODB_ANALYZE_IS_PERSISTENT
 INNODB_PRINT_ALL_DEADLOCKS
@@ -32,7 +31,6 @@ INNODB_ROLLBACK_SEGMENTS
 INNODB_STATS_PERSISTENT_SAMPLE_PAGES
 RELAY_LOG_BASENAME
 LOG_BIN_BASENAME
-PFS_MAX_SOCKET_INSTANCES
 INNODB_MONITOR_RESET
 INNODB_ANALYZE_IS_PERSISTENT
 INNODB_PRINT_ALL_DEADLOCKS

=== renamed file 'mysql-test/suite/sys_vars/r/pfs_max_sockets_basic.result' => 'mysql-test/suite/sys_vars/r/pfs_max_socket_instances_basic.result'
=== renamed file 'mysql-test/suite/sys_vars/t/pfs_max_sockets_basic-master.opt' => 'mysql-test/suite/sys_vars/t/pfs_max_socket_instances_basic-master.opt'
=== renamed file 'mysql-test/suite/sys_vars/t/pfs_max_sockets_basic.test' => 'mysql-test/suite/sys_vars/t/pfs_max_socket_instances_basic.test'
=== modified file 'storage/perfschema/pfs_instr_class.cc'
--- a/storage/perfschema/pfs_instr_class.cc	2011-02-25 21:12:43 +0000
+++ b/storage/perfschema/pfs_instr_class.cc	2011-03-11 19:52:13 +0000
@@ -832,7 +832,7 @@ PFS_socket_key register_socket_class(con
     entry= &socket_class_array[index];
     init_instr_class(entry, name, name_length, flags);
     entry->m_index= index;
-    entry->m_event_name_index= file_class_start + index;
+    entry->m_event_name_index= socket_class_start + index;
     entry->m_singleton= NULL;
     PFS_atomic::add_u32(&socket_class_allocated_count, 1);
     return (index + 1);


Attachment: [text/bzr-bundle] bzr/cpowers@tma-1-20110311204731-o7216amedsk493gh.bundle
Thread
bzr push into mysql-trunk branch (chris.powers:3249 to 3253) WL#4896Christopher Powers12 Mar