List:Commits« Previous MessageNext Message »
From:Christopher Powers Date:May 25 2011 2:04pm
Subject:bzr commit into mysql-trunk branch (chris.powers:3297) WL#4896
View as plain text  
#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


Attachment: [text/bzr-bundle] bzr/chris.powers@oracle.com-20110525140429-dq1j4hd1h7bbdjh3.bundle
Thread
bzr commit into mysql-trunk branch (chris.powers:3297) WL#4896Christopher Powers25 May