From: Christopher Powers Date: May 25 2011 2:04pm Subject: bzr commit into mysql-trunk branch (chris.powers:3297) WL#4896 List-Archive: http://lists.mysql.com/commits/138078 Message-Id: <20110525140433.F36CF1DB032F@xeno.mysql.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0180319072972452603==" --===============0180319072972452603== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #At file:///home/cpowers/work/dev/mysql-trunk-wl4896/ based on revid:chris.powers@stripped 3297 Christopher Powers 2011-05-25 WL#4896 "Performance Schema Net IO" - Fix PB failures modified: mysql-test/suite/perfschema/r/pfs_upgrade.result mysql-test/suite/perfschema/r/schema.result === modified file 'mysql-test/suite/perfschema/r/pfs_upgrade.result' --- a/mysql-test/suite/perfschema/r/pfs_upgrade.result 2011-05-17 09:15:47 +0000 +++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result 2011-05-25 14:04:29 +0000 @@ -18,30 +18,33 @@ ERROR 1050 (42S01) at line 180: Table 'e ERROR 1050 (42S01) at line 189: Table 'file_instances' already exists ERROR 1050 (42S01) at line 200: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 212: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 221: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 235: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 245: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 255: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 487: Table 'threads' already exists -ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 532: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 545: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 557: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 600: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 643: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 225: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 255: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 284: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 293: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 307: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 317: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 327: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 336: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 344: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 353: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 363: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 371: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 416: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 460: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 539: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 559: Table 'threads' already exists +ERROR 1050 (42S01) at line 574: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 589: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 604: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 617: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 629: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 672: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 715: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 758: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 790: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 821: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1644 (HY000) at line 1241: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_table"; Tables_in_performance_schema (user_table) @@ -64,30 +67,33 @@ ERROR 1050 (42S01) at line 180: Table 'e ERROR 1050 (42S01) at line 189: Table 'file_instances' already exists ERROR 1050 (42S01) at line 200: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 212: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 221: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 235: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 245: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 255: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 487: Table 'threads' already exists -ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 532: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 545: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 557: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 600: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 643: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 225: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 255: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 284: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 293: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 307: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 317: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 327: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 336: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 344: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 353: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 363: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 371: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 416: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 460: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 539: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 559: Table 'threads' already exists +ERROR 1050 (42S01) at line 574: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 589: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 604: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 617: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 629: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 672: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 715: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 758: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 790: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 821: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1644 (HY000) at line 1241: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed show tables like "user_view"; Tables_in_performance_schema (user_view) @@ -108,30 +114,33 @@ ERROR 1050 (42S01) at line 180: Table 'e ERROR 1050 (42S01) at line 189: Table 'file_instances' already exists ERROR 1050 (42S01) at line 200: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 212: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 221: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 235: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 245: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 255: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 487: Table 'threads' already exists -ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 532: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 545: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 557: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 600: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 643: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 225: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 255: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 284: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 293: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 307: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 317: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 327: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 336: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 344: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 353: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 363: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 371: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 416: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 460: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 539: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 559: Table 'threads' already exists +ERROR 1050 (42S01) at line 574: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 589: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 604: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 617: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 629: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 672: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 715: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 758: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 790: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 821: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1644 (HY000) at line 1241: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -152,30 +161,33 @@ ERROR 1050 (42S01) at line 180: Table 'e ERROR 1050 (42S01) at line 189: Table 'file_instances' already exists ERROR 1050 (42S01) at line 200: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 212: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 221: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 235: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 245: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 255: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 487: Table 'threads' already exists -ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 532: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 545: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 557: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 600: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 643: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 225: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 255: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 284: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 293: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 307: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 317: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 327: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 336: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 344: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 353: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 363: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 371: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 416: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 460: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 539: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 559: Table 'threads' already exists +ERROR 1050 (42S01) at line 574: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 589: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 604: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 617: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 629: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 672: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 715: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 758: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 790: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 821: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1644 (HY000) at line 1241: Unexpected content found in the performance_schema database. FATAL ERROR: Upgrade failed select name from mysql.proc where db='performance_schema'; name @@ -196,30 +208,33 @@ ERROR 1050 (42S01) at line 180: Table 'e ERROR 1050 (42S01) at line 189: Table 'file_instances' already exists ERROR 1050 (42S01) at line 200: Table 'file_summary_by_event_name' already exists ERROR 1050 (42S01) at line 212: Table 'file_summary_by_instance' already exists -ERROR 1050 (42S01) at line 221: Table 'mutex_instances' already exists -ERROR 1050 (42S01) at line 235: Table 'objects_summary_global_by_type' already exists -ERROR 1050 (42S01) at line 245: Table 'performance_timers' already exists -ERROR 1050 (42S01) at line 255: Table 'rwlock_instances' already exists -ERROR 1050 (42S01) at line 264: Table 'setup_actors' already exists -ERROR 1050 (42S01) at line 272: Table 'setup_consumers' already exists -ERROR 1050 (42S01) at line 281: Table 'setup_instruments' already exists -ERROR 1050 (42S01) at line 291: Table 'setup_objects' already exists -ERROR 1050 (42S01) at line 299: Table 'setup_timers' already exists -ERROR 1050 (42S01) at line 344: Table 'table_io_waits_summary_by_index_usage' already exists -ERROR 1050 (42S01) at line 388: Table 'table_io_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 467: Table 'table_lock_waits_summary_by_table' already exists -ERROR 1050 (42S01) at line 487: Table 'threads' already exists -ERROR 1050 (42S01) at line 502: Table 'events_stages_current' already exists -ERROR 1050 (42S01) at line 517: Table 'events_stages_history' already exists -ERROR 1050 (42S01) at line 532: Table 'events_stages_history_long' already exists -ERROR 1050 (42S01) at line 545: Table 'events_stages_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 557: Table 'events_stages_summary_global_by_event_name' already exists -ERROR 1050 (42S01) at line 600: Table 'events_statements_current' already exists -ERROR 1050 (42S01) at line 643: Table 'events_statements_history' already exists -ERROR 1050 (42S01) at line 686: Table 'events_statements_history_long' already exists -ERROR 1050 (42S01) at line 718: Table 'events_statements_summary_by_thread_by_event_name' already exists -ERROR 1050 (42S01) at line 749: Table 'events_statements_summary_global_by_event_name' already exists -ERROR 1644 (HY000) at line 1169: Unexpected content found in the performance_schema database. +ERROR 1050 (42S01) at line 225: Table 'socket_instances' already exists +ERROR 1050 (42S01) at line 255: Table 'socket_summary_by_instance' already exists +ERROR 1050 (42S01) at line 284: Table 'socket_summary_by_event_name' already exists +ERROR 1050 (42S01) at line 293: Table 'mutex_instances' already exists +ERROR 1050 (42S01) at line 307: Table 'objects_summary_global_by_type' already exists +ERROR 1050 (42S01) at line 317: Table 'performance_timers' already exists +ERROR 1050 (42S01) at line 327: Table 'rwlock_instances' already exists +ERROR 1050 (42S01) at line 336: Table 'setup_actors' already exists +ERROR 1050 (42S01) at line 344: Table 'setup_consumers' already exists +ERROR 1050 (42S01) at line 353: Table 'setup_instruments' already exists +ERROR 1050 (42S01) at line 363: Table 'setup_objects' already exists +ERROR 1050 (42S01) at line 371: Table 'setup_timers' already exists +ERROR 1050 (42S01) at line 416: Table 'table_io_waits_summary_by_index_usage' already exists +ERROR 1050 (42S01) at line 460: Table 'table_io_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 539: Table 'table_lock_waits_summary_by_table' already exists +ERROR 1050 (42S01) at line 559: Table 'threads' already exists +ERROR 1050 (42S01) at line 574: Table 'events_stages_current' already exists +ERROR 1050 (42S01) at line 589: Table 'events_stages_history' already exists +ERROR 1050 (42S01) at line 604: Table 'events_stages_history_long' already exists +ERROR 1050 (42S01) at line 617: Table 'events_stages_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 629: Table 'events_stages_summary_global_by_event_name' already exists +ERROR 1050 (42S01) at line 672: Table 'events_statements_current' already exists +ERROR 1050 (42S01) at line 715: Table 'events_statements_history' already exists +ERROR 1050 (42S01) at line 758: Table 'events_statements_history_long' already exists +ERROR 1050 (42S01) at line 790: Table 'events_statements_summary_by_thread_by_event_name' already exists +ERROR 1050 (42S01) at line 821: Table 'events_statements_summary_global_by_event_name' already exists +ERROR 1644 (HY000) at line 1241: 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/schema.result' --- a/mysql-test/suite/perfschema/r/schema.result 2011-05-17 09:15:47 +0000 +++ b/mysql-test/suite/perfschema/r/schema.result 2011-05-25 14:04:29 +0000 @@ -36,6 +36,9 @@ setup_consumers setup_instruments setup_objects setup_timers +socket_instances +socket_summary_by_event_name +socket_summary_by_instance table_io_waits_summary_by_index_usage table_io_waits_summary_by_table table_lock_waits_summary_by_table --===============0180319072972452603== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/chris.powers@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: chris.powers@stripped # target_branch: file:///home/cpowers/work/dev/mysql-trunk-wl4896/ # testament_sha1: 2174d261331f5408045a9958420d5774cb13476b # timestamp: 2011-05-25 09:04:33 -0500 # source_branch: file:///home/cpowers/work/dev/mysql-trunk/ # base_revision_id: chris.powers@stripped\ # 8ilbh6wqaw61ysj8 # # Begin bundle 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 nChIZfHy9QA= --===============0180319072972452603==--