From: Christopher Powers Date: March 11 2011 10:13pm Subject: bzr push into mysql-trunk branch (chris.powers:3249 to 3253) WL#4896 List-Archive: http://lists.mysql.com/commits/132864 Message-Id: <20110311221355.4865E1DB0335@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6410909784392366714==" --===============6410909784392366714== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline 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); --===============6410909784392366714== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/cpowers@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: cpowers@tma-1-20110311204731-o7216amedsk493gh # target_branch: file:///home/cpowers/work/dev/base_mysql-trunk-\ # wl4896/ # testament_sha1: fab46494e064ad2514f0389f06b8fbbce42d6a4d # timestamp: 2011-03-11 16:13:54 -0600 # base_revision_id: chris.powers@stripped\ # 0rnz6ugknebxninl # # Begin bundle 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 1DxdN4b0NyadfZqrtP/i7kinChIbpIHDwA== --===============6410909784392366714==--