List:Commits« Previous MessageNext Message »
From:Marc Alff Date:April 7 2011 11:04pm
Subject:bzr commit into mysql-trunk branch (marc.alff:3336)
View as plain text  
#At file:///Users/malff/BZR_TREE/mysql-trunk-wl5378/ based on revid:marc.alff@stripped

 3336 Marc Alff	2011-04-08
      merge cleanup

    modified:
      mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result
      mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result
      mysql-test/suite/perfschema/r/schema_lc0.result
      mysql-test/suite/perfschema/r/schema_lc1.result
=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result	2011-02-25 16:41:57 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc0.result	2011-04-07 23:04:38 +0000
@@ -13,35 +13,47 @@ ERROR 1050 (42S01) at line 94: Table 'ev
 ERROR 1050 (42S01) at line 118: Table 'events_waits_history' already exists
 ERROR 1050 (42S01) at line 142: Table 'events_waits_history_long' already exists
 ERROR 1050 (42S01) at line 155: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 168: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 180: Table 'events_waits_summary_global_by_event_name' already exists
-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 168: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 181: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 220: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 229: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 240: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 252: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 261: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 275: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 285: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 295: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 304: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 312: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 321: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 331: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 339: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 384: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 428: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 507: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 527: Table 'threads' already exists
+ERROR 1050 (42S01) at line 542: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 557: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 572: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 585: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 598: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 611: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 625: Table 'events_stages_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 637: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 680: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 723: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 766: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 798: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 830: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 862: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 895: Table 'events_statements_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 926: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 935: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 944: Table 'users' already exists
+ERROR 1050 (42S01) at line 954: Table 'user_hosts' already exists
+ERROR 1644 (HY000) at line 1374: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -59,35 +71,47 @@ ERROR 1050 (42S01) at line 94: Table 'ev
 ERROR 1050 (42S01) at line 118: Table 'events_waits_history' already exists
 ERROR 1050 (42S01) at line 142: Table 'events_waits_history_long' already exists
 ERROR 1050 (42S01) at line 155: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 168: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 180: Table 'events_waits_summary_global_by_event_name' already exists
-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 168: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 181: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 220: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 229: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 240: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 252: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 261: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 275: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 285: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 295: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 304: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 312: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 321: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 331: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 339: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 384: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 428: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 507: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 527: Table 'threads' already exists
+ERROR 1050 (42S01) at line 542: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 557: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 572: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 585: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 598: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 611: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 625: Table 'events_stages_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 637: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 680: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 723: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 766: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 798: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 830: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 862: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 895: Table 'events_statements_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 926: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 935: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 944: Table 'users' already exists
+ERROR 1050 (42S01) at line 954: Table 'user_hosts' already exists
+ERROR 1644 (HY000) at line 1374: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -103,35 +127,47 @@ ERROR 1050 (42S01) at line 94: Table 'ev
 ERROR 1050 (42S01) at line 118: Table 'events_waits_history' already exists
 ERROR 1050 (42S01) at line 142: Table 'events_waits_history_long' already exists
 ERROR 1050 (42S01) at line 155: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 168: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 180: Table 'events_waits_summary_global_by_event_name' already exists
-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 168: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 181: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 220: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 229: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 240: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 252: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 261: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 275: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 285: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 295: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 304: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 312: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 321: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 331: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 339: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 384: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 428: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 507: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 527: Table 'threads' already exists
+ERROR 1050 (42S01) at line 542: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 557: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 572: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 585: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 598: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 611: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 625: Table 'events_stages_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 637: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 680: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 723: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 766: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 798: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 830: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 862: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 895: Table 'events_statements_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 926: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 935: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 944: Table 'users' already exists
+ERROR 1050 (42S01) at line 954: Table 'user_hosts' already exists
+ERROR 1644 (HY000) at line 1374: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -147,35 +183,47 @@ ERROR 1050 (42S01) at line 94: Table 'ev
 ERROR 1050 (42S01) at line 118: Table 'events_waits_history' already exists
 ERROR 1050 (42S01) at line 142: Table 'events_waits_history_long' already exists
 ERROR 1050 (42S01) at line 155: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 168: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 180: Table 'events_waits_summary_global_by_event_name' already exists
-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 168: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 181: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 220: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 229: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 240: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 252: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 261: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 275: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 285: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 295: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 304: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 312: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 321: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 331: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 339: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 384: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 428: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 507: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 527: Table 'threads' already exists
+ERROR 1050 (42S01) at line 542: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 557: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 572: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 585: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 598: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 611: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 625: Table 'events_stages_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 637: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 680: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 723: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 766: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 798: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 830: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 862: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 895: Table 'events_statements_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 926: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 935: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 944: Table 'users' already exists
+ERROR 1050 (42S01) at line 954: Table 'user_hosts' already exists
+ERROR 1644 (HY000) at line 1374: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -191,35 +239,47 @@ ERROR 1050 (42S01) at line 94: Table 'ev
 ERROR 1050 (42S01) at line 118: Table 'events_waits_history' already exists
 ERROR 1050 (42S01) at line 142: Table 'events_waits_history_long' already exists
 ERROR 1050 (42S01) at line 155: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 168: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 180: Table 'events_waits_summary_global_by_event_name' already exists
-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 168: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 181: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 220: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 229: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 240: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 252: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 261: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 275: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 285: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 295: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 304: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 312: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 321: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 331: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 339: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 384: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 428: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 507: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 527: Table 'threads' already exists
+ERROR 1050 (42S01) at line 542: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 557: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 572: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 585: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 598: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 611: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 625: Table 'events_stages_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 637: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 680: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 723: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 766: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 798: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 830: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 862: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 895: Table 'events_statements_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 926: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 935: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 944: Table 'users' already exists
+ERROR 1050 (42S01) at line 954: Table 'user_hosts' already exists
+ERROR 1644 (HY000) at line 1374: 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 16:41:57 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_lc1.result	2011-04-07 23:04:38 +0000
@@ -13,35 +13,47 @@ ERROR 1050 (42S01) at line 94: Table 'ev
 ERROR 1050 (42S01) at line 118: Table 'events_waits_history' already exists
 ERROR 1050 (42S01) at line 142: Table 'events_waits_history_long' already exists
 ERROR 1050 (42S01) at line 155: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 168: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 180: Table 'events_waits_summary_global_by_event_name' already exists
-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 168: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 181: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 220: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 229: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 240: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 252: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 261: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 275: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 285: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 295: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 304: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 312: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 321: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 331: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 339: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 384: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 428: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 507: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 527: Table 'threads' already exists
+ERROR 1050 (42S01) at line 542: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 557: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 572: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 585: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 598: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 611: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 625: Table 'events_stages_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 637: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 680: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 723: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 766: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 798: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 830: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 862: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 895: Table 'events_statements_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 926: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 935: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 944: Table 'users' already exists
+ERROR 1050 (42S01) at line 954: Table 'user_hosts' already exists
+ERROR 1644 (HY000) at line 1374: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -59,35 +71,47 @@ ERROR 1050 (42S01) at line 94: Table 'ev
 ERROR 1050 (42S01) at line 118: Table 'events_waits_history' already exists
 ERROR 1050 (42S01) at line 142: Table 'events_waits_history_long' already exists
 ERROR 1050 (42S01) at line 155: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 168: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 180: Table 'events_waits_summary_global_by_event_name' already exists
-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 168: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 181: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 220: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 229: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 240: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 252: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 261: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 275: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 285: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 295: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 304: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 312: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 321: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 331: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 339: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 384: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 428: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 507: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 527: Table 'threads' already exists
+ERROR 1050 (42S01) at line 542: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 557: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 572: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 585: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 598: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 611: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 625: Table 'events_stages_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 637: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 680: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 723: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 766: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 798: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 830: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 862: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 895: Table 'events_statements_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 926: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 935: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 944: Table 'users' already exists
+ERROR 1050 (42S01) at line 954: Table 'user_hosts' already exists
+ERROR 1644 (HY000) at line 1374: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -103,35 +127,47 @@ ERROR 1050 (42S01) at line 94: Table 'ev
 ERROR 1050 (42S01) at line 118: Table 'events_waits_history' already exists
 ERROR 1050 (42S01) at line 142: Table 'events_waits_history_long' already exists
 ERROR 1050 (42S01) at line 155: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 168: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 180: Table 'events_waits_summary_global_by_event_name' already exists
-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 168: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 181: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 220: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 229: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 240: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 252: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 261: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 275: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 285: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 295: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 304: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 312: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 321: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 331: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 339: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 384: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 428: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 507: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 527: Table 'threads' already exists
+ERROR 1050 (42S01) at line 542: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 557: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 572: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 585: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 598: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 611: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 625: Table 'events_stages_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 637: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 680: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 723: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 766: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 798: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 830: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 862: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 895: Table 'events_statements_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 926: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 935: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 944: Table 'users' already exists
+ERROR 1050 (42S01) at line 954: Table 'user_hosts' already exists
+ERROR 1644 (HY000) at line 1374: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -147,35 +183,47 @@ ERROR 1050 (42S01) at line 94: Table 'ev
 ERROR 1050 (42S01) at line 118: Table 'events_waits_history' already exists
 ERROR 1050 (42S01) at line 142: Table 'events_waits_history_long' already exists
 ERROR 1050 (42S01) at line 155: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 168: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 180: Table 'events_waits_summary_global_by_event_name' already exists
-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 168: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 181: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 220: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 229: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 240: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 252: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 261: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 275: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 285: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 295: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 304: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 312: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 321: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 331: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 339: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 384: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 428: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 507: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 527: Table 'threads' already exists
+ERROR 1050 (42S01) at line 542: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 557: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 572: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 585: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 598: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 611: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 625: Table 'events_stages_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 637: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 680: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 723: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 766: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 798: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 830: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 862: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 895: Table 'events_statements_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 926: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 935: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 944: Table 'users' already exists
+ERROR 1050 (42S01) at line 954: Table 'user_hosts' already exists
+ERROR 1644 (HY000) at line 1374: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -191,35 +239,47 @@ ERROR 1050 (42S01) at line 94: Table 'ev
 ERROR 1050 (42S01) at line 118: Table 'events_waits_history' already exists
 ERROR 1050 (42S01) at line 142: Table 'events_waits_history_long' already exists
 ERROR 1050 (42S01) at line 155: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 168: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 180: Table 'events_waits_summary_global_by_event_name' already exists
-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 168: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 181: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 220: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 229: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 240: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 252: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 261: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 275: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 285: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 295: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 304: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 312: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 321: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 331: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 339: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 384: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 428: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 507: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 527: Table 'threads' already exists
+ERROR 1050 (42S01) at line 542: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 557: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 572: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 585: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 598: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 611: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 625: Table 'events_stages_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 637: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 680: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 723: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 766: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 798: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 830: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 862: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 895: Table 'events_statements_summary_by_user_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 926: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 935: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 944: Table 'users' already exists
+ERROR 1050 (42S01) at line 954: Table 'user_hosts' already exists
+ERROR 1644 (HY000) at line 1374: 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_lc0.result'
--- a/mysql-test/suite/perfschema/r/schema_lc0.result	2011-02-15 17:14:15 +0000
+++ b/mysql-test/suite/perfschema/r/schema_lc0.result	2011-04-07 23:04:38 +0000
@@ -11,22 +11,32 @@ cond_instances
 events_stages_current
 events_stages_history
 events_stages_history_long
+events_stages_summary_by_host_by_event_name
 events_stages_summary_by_thread_by_event_name
+events_stages_summary_by_user_by_event_name
+events_stages_summary_by_user_host_by_event_name
 events_stages_summary_global_by_event_name
 events_statements_current
 events_statements_history
 events_statements_history_long
+events_statements_summary_by_host_by_event_name
 events_statements_summary_by_thread_by_event_name
+events_statements_summary_by_user_by_event_name
+events_statements_summary_by_user_host_by_event_name
 events_statements_summary_global_by_event_name
 events_waits_current
 events_waits_history
 events_waits_history_long
+events_waits_summary_by_host_by_event_name
 events_waits_summary_by_instance
 events_waits_summary_by_thread_by_event_name
+events_waits_summary_by_user_by_event_name
+events_waits_summary_by_user_host_by_event_name
 events_waits_summary_global_by_event_name
 file_instances
 file_summary_by_event_name
 file_summary_by_instance
+hosts
 mutex_instances
 objects_summary_global_by_type
 performance_timers
@@ -40,6 +50,8 @@ table_io_waits_summary_by_index_usage
 table_io_waits_summary_by_table
 table_lock_waits_summary_by_table
 threads
+user_hosts
+users
 show create table cond_instances;
 Table	Create Table
 cond_instances	CREATE TABLE `cond_instances` (
@@ -85,6 +97,17 @@ events_stages_history_long	CREATE TABLE 
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
   `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_stages_summary_by_host_by_event_name;
+Table	Create Table
+events_stages_summary_by_host_by_event_name	CREATE TABLE `events_stages_summary_by_host_by_event_name` (
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_stages_summary_by_thread_by_event_name;
 Table	Create Table
 events_stages_summary_by_thread_by_event_name	CREATE TABLE `events_stages_summary_by_thread_by_event_name` (
@@ -96,6 +119,29 @@ events_stages_summary_by_thread_by_event
   `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
   `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_stages_summary_by_user_by_event_name;
+Table	Create Table
+events_stages_summary_by_user_by_event_name	CREATE TABLE `events_stages_summary_by_user_by_event_name` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_stages_summary_by_user_host_by_event_name;
+Table	Create Table
+events_stages_summary_by_user_host_by_event_name	CREATE TABLE `events_stages_summary_by_user_host_by_event_name` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_stages_summary_global_by_event_name;
 Table	Create Table
 events_stages_summary_global_by_event_name	CREATE TABLE `events_stages_summary_global_by_event_name` (
@@ -229,6 +275,36 @@ events_statements_history_long	CREATE TA
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
   `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_statements_summary_by_host_by_event_name;
+Table	Create Table
+events_statements_summary_by_host_by_event_name	CREATE TABLE `events_statements_summary_by_host_by_event_name` (
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `SUM_LOCK_TIME` bigint(20) unsigned NOT NULL,
+  `SUM_ERRORS` bigint(20) unsigned NOT NULL,
+  `SUM_WARNINGS` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_AFFECTED` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_SENT` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_EXAMINED` bigint(20) unsigned NOT NULL,
+  `SUM_CREATED_TMP_DISK_TABLES` bigint(20) unsigned NOT NULL,
+  `SUM_CREATED_TMP_TABLES` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_FULL_JOIN` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_FULL_RANGE_JOIN` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_RANGE` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_RANGE_CHECK` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_SCAN` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_MERGE_PASSES` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_RANGE` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_ROWS` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_SCAN` bigint(20) unsigned NOT NULL,
+  `SUM_NO_INDEX_USED` bigint(20) unsigned NOT NULL,
+  `SUM_NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_statements_summary_by_thread_by_event_name;
 Table	Create Table
 events_statements_summary_by_thread_by_event_name	CREATE TABLE `events_statements_summary_by_thread_by_event_name` (
@@ -259,6 +335,67 @@ events_statements_summary_by_thread_by_e
   `SUM_NO_INDEX_USED` bigint(20) unsigned NOT NULL,
   `SUM_NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_statements_summary_by_user_by_event_name;
+Table	Create Table
+events_statements_summary_by_user_by_event_name	CREATE TABLE `events_statements_summary_by_user_by_event_name` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `SUM_LOCK_TIME` bigint(20) unsigned NOT NULL,
+  `SUM_ERRORS` bigint(20) unsigned NOT NULL,
+  `SUM_WARNINGS` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_AFFECTED` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_SENT` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_EXAMINED` bigint(20) unsigned NOT NULL,
+  `SUM_CREATED_TMP_DISK_TABLES` bigint(20) unsigned NOT NULL,
+  `SUM_CREATED_TMP_TABLES` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_FULL_JOIN` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_FULL_RANGE_JOIN` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_RANGE` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_RANGE_CHECK` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_SCAN` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_MERGE_PASSES` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_RANGE` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_ROWS` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_SCAN` bigint(20) unsigned NOT NULL,
+  `SUM_NO_INDEX_USED` bigint(20) unsigned NOT NULL,
+  `SUM_NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_statements_summary_by_user_host_by_event_name;
+Table	Create Table
+events_statements_summary_by_user_host_by_event_name	CREATE TABLE `events_statements_summary_by_user_host_by_event_name` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `SUM_LOCK_TIME` bigint(20) unsigned NOT NULL,
+  `SUM_ERRORS` bigint(20) unsigned NOT NULL,
+  `SUM_WARNINGS` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_AFFECTED` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_SENT` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_EXAMINED` bigint(20) unsigned NOT NULL,
+  `SUM_CREATED_TMP_DISK_TABLES` bigint(20) unsigned NOT NULL,
+  `SUM_CREATED_TMP_TABLES` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_FULL_JOIN` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_FULL_RANGE_JOIN` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_RANGE` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_RANGE_CHECK` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_SCAN` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_MERGE_PASSES` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_RANGE` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_ROWS` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_SCAN` bigint(20) unsigned NOT NULL,
+  `SUM_NO_INDEX_USED` bigint(20) unsigned NOT NULL,
+  `SUM_NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_statements_summary_global_by_event_name;
 Table	Create Table
 events_statements_summary_global_by_event_name	CREATE TABLE `events_statements_summary_global_by_event_name` (
@@ -354,6 +491,17 @@ events_waits_history_long	CREATE TABLE `
   `NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL,
   `FLAGS` int(10) unsigned DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_waits_summary_by_host_by_event_name;
+Table	Create Table
+events_waits_summary_by_host_by_event_name	CREATE TABLE `events_waits_summary_by_host_by_event_name` (
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_waits_summary_by_instance;
 Table	Create Table
 events_waits_summary_by_instance	CREATE TABLE `events_waits_summary_by_instance` (
@@ -376,6 +524,29 @@ events_waits_summary_by_thread_by_event_
   `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
   `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_waits_summary_by_user_by_event_name;
+Table	Create Table
+events_waits_summary_by_user_by_event_name	CREATE TABLE `events_waits_summary_by_user_by_event_name` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_waits_summary_by_user_host_by_event_name;
+Table	Create Table
+events_waits_summary_by_user_host_by_event_name	CREATE TABLE `events_waits_summary_by_user_host_by_event_name` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_waits_summary_global_by_event_name;
 Table	Create Table
 events_waits_summary_global_by_event_name	CREATE TABLE `events_waits_summary_global_by_event_name` (
@@ -412,6 +583,13 @@ file_summary_by_instance	CREATE TABLE `f
   `SUM_NUMBER_OF_BYTES_READ` bigint(20) unsigned NOT NULL,
   `SUM_NUMBER_OF_BYTES_WRITE` bigint(20) unsigned NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table hosts;
+Table	Create Table
+hosts	CREATE TABLE `hosts` (
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `CURRENT_CONNECTIONS` bigint(20) NOT NULL,
+  `TOTAL_CONNECTIONS` bigint(20) NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table mutex_instances;
 Table	Create Table
 mutex_instances	CREATE TABLE `mutex_instances` (
@@ -661,3 +839,18 @@ threads	CREATE TABLE `threads` (
   `ROLE` varchar(64) DEFAULT NULL,
   `INSTRUMENTED` enum('YES','NO') NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table user_hosts;
+Table	Create Table
+user_hosts	CREATE TABLE `user_hosts` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `CURRENT_CONNECTIONS` bigint(20) NOT NULL,
+  `TOTAL_CONNECTIONS` bigint(20) NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table users;
+Table	Create Table
+users	CREATE TABLE `users` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `CURRENT_CONNECTIONS` bigint(20) NOT NULL,
+  `TOTAL_CONNECTIONS` bigint(20) NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8

=== modified file 'mysql-test/suite/perfschema/r/schema_lc1.result'
--- a/mysql-test/suite/perfschema/r/schema_lc1.result	2011-02-15 17:14:15 +0000
+++ b/mysql-test/suite/perfschema/r/schema_lc1.result	2011-04-07 23:04:38 +0000
@@ -11,22 +11,32 @@ cond_instances
 events_stages_current
 events_stages_history
 events_stages_history_long
+events_stages_summary_by_host_by_event_name
 events_stages_summary_by_thread_by_event_name
+events_stages_summary_by_user_by_event_name
+events_stages_summary_by_user_host_by_event_name
 events_stages_summary_global_by_event_name
 events_statements_current
 events_statements_history
 events_statements_history_long
+events_statements_summary_by_host_by_event_name
 events_statements_summary_by_thread_by_event_name
+events_statements_summary_by_user_by_event_name
+events_statements_summary_by_user_host_by_event_name
 events_statements_summary_global_by_event_name
 events_waits_current
 events_waits_history
 events_waits_history_long
+events_waits_summary_by_host_by_event_name
 events_waits_summary_by_instance
 events_waits_summary_by_thread_by_event_name
+events_waits_summary_by_user_by_event_name
+events_waits_summary_by_user_host_by_event_name
 events_waits_summary_global_by_event_name
 file_instances
 file_summary_by_event_name
 file_summary_by_instance
+hosts
 mutex_instances
 objects_summary_global_by_type
 performance_timers
@@ -40,6 +50,8 @@ table_io_waits_summary_by_index_usage
 table_io_waits_summary_by_table
 table_lock_waits_summary_by_table
 threads
+user_hosts
+users
 show create table cond_instances;
 Table	Create Table
 cond_instances	CREATE TABLE `cond_instances` (
@@ -85,6 +97,17 @@ events_stages_history_long	CREATE TABLE 
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
   `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_stages_summary_by_host_by_event_name;
+Table	Create Table
+events_stages_summary_by_host_by_event_name	CREATE TABLE `events_stages_summary_by_host_by_event_name` (
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_stages_summary_by_thread_by_event_name;
 Table	Create Table
 events_stages_summary_by_thread_by_event_name	CREATE TABLE `events_stages_summary_by_thread_by_event_name` (
@@ -96,6 +119,29 @@ events_stages_summary_by_thread_by_event
   `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
   `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_stages_summary_by_user_by_event_name;
+Table	Create Table
+events_stages_summary_by_user_by_event_name	CREATE TABLE `events_stages_summary_by_user_by_event_name` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_stages_summary_by_user_host_by_event_name;
+Table	Create Table
+events_stages_summary_by_user_host_by_event_name	CREATE TABLE `events_stages_summary_by_user_host_by_event_name` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_stages_summary_global_by_event_name;
 Table	Create Table
 events_stages_summary_global_by_event_name	CREATE TABLE `events_stages_summary_global_by_event_name` (
@@ -229,6 +275,36 @@ events_statements_history_long	CREATE TA
   `NESTING_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
   `NESTING_EVENT_TYPE` enum('STATEMENT','STAGE','WAIT') DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_statements_summary_by_host_by_event_name;
+Table	Create Table
+events_statements_summary_by_host_by_event_name	CREATE TABLE `events_statements_summary_by_host_by_event_name` (
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `SUM_LOCK_TIME` bigint(20) unsigned NOT NULL,
+  `SUM_ERRORS` bigint(20) unsigned NOT NULL,
+  `SUM_WARNINGS` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_AFFECTED` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_SENT` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_EXAMINED` bigint(20) unsigned NOT NULL,
+  `SUM_CREATED_TMP_DISK_TABLES` bigint(20) unsigned NOT NULL,
+  `SUM_CREATED_TMP_TABLES` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_FULL_JOIN` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_FULL_RANGE_JOIN` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_RANGE` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_RANGE_CHECK` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_SCAN` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_MERGE_PASSES` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_RANGE` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_ROWS` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_SCAN` bigint(20) unsigned NOT NULL,
+  `SUM_NO_INDEX_USED` bigint(20) unsigned NOT NULL,
+  `SUM_NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_statements_summary_by_thread_by_event_name;
 Table	Create Table
 events_statements_summary_by_thread_by_event_name	CREATE TABLE `events_statements_summary_by_thread_by_event_name` (
@@ -259,6 +335,67 @@ events_statements_summary_by_thread_by_e
   `SUM_NO_INDEX_USED` bigint(20) unsigned NOT NULL,
   `SUM_NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_statements_summary_by_user_by_event_name;
+Table	Create Table
+events_statements_summary_by_user_by_event_name	CREATE TABLE `events_statements_summary_by_user_by_event_name` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `SUM_LOCK_TIME` bigint(20) unsigned NOT NULL,
+  `SUM_ERRORS` bigint(20) unsigned NOT NULL,
+  `SUM_WARNINGS` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_AFFECTED` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_SENT` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_EXAMINED` bigint(20) unsigned NOT NULL,
+  `SUM_CREATED_TMP_DISK_TABLES` bigint(20) unsigned NOT NULL,
+  `SUM_CREATED_TMP_TABLES` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_FULL_JOIN` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_FULL_RANGE_JOIN` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_RANGE` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_RANGE_CHECK` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_SCAN` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_MERGE_PASSES` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_RANGE` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_ROWS` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_SCAN` bigint(20) unsigned NOT NULL,
+  `SUM_NO_INDEX_USED` bigint(20) unsigned NOT NULL,
+  `SUM_NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_statements_summary_by_user_host_by_event_name;
+Table	Create Table
+events_statements_summary_by_user_host_by_event_name	CREATE TABLE `events_statements_summary_by_user_host_by_event_name` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `SUM_LOCK_TIME` bigint(20) unsigned NOT NULL,
+  `SUM_ERRORS` bigint(20) unsigned NOT NULL,
+  `SUM_WARNINGS` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_AFFECTED` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_SENT` bigint(20) unsigned NOT NULL,
+  `SUM_ROWS_EXAMINED` bigint(20) unsigned NOT NULL,
+  `SUM_CREATED_TMP_DISK_TABLES` bigint(20) unsigned NOT NULL,
+  `SUM_CREATED_TMP_TABLES` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_FULL_JOIN` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_FULL_RANGE_JOIN` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_RANGE` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_RANGE_CHECK` bigint(20) unsigned NOT NULL,
+  `SUM_SELECT_SCAN` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_MERGE_PASSES` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_RANGE` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_ROWS` bigint(20) unsigned NOT NULL,
+  `SUM_SORT_SCAN` bigint(20) unsigned NOT NULL,
+  `SUM_NO_INDEX_USED` bigint(20) unsigned NOT NULL,
+  `SUM_NO_GOOD_INDEX_USED` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_statements_summary_global_by_event_name;
 Table	Create Table
 events_statements_summary_global_by_event_name	CREATE TABLE `events_statements_summary_global_by_event_name` (
@@ -354,6 +491,17 @@ events_waits_history_long	CREATE TABLE `
   `NUMBER_OF_BYTES` bigint(20) unsigned DEFAULT NULL,
   `FLAGS` int(10) unsigned DEFAULT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_waits_summary_by_host_by_event_name;
+Table	Create Table
+events_waits_summary_by_host_by_event_name	CREATE TABLE `events_waits_summary_by_host_by_event_name` (
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_waits_summary_by_instance;
 Table	Create Table
 events_waits_summary_by_instance	CREATE TABLE `events_waits_summary_by_instance` (
@@ -376,6 +524,29 @@ events_waits_summary_by_thread_by_event_
   `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
   `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_waits_summary_by_user_by_event_name;
+Table	Create Table
+events_waits_summary_by_user_by_event_name	CREATE TABLE `events_waits_summary_by_user_by_event_name` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table events_waits_summary_by_user_host_by_event_name;
+Table	Create Table
+events_waits_summary_by_user_host_by_event_name	CREATE TABLE `events_waits_summary_by_user_host_by_event_name` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `EVENT_NAME` varchar(128) NOT NULL,
+  `COUNT_STAR` bigint(20) unsigned NOT NULL,
+  `SUM_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MIN_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `AVG_TIMER_WAIT` bigint(20) unsigned NOT NULL,
+  `MAX_TIMER_WAIT` bigint(20) unsigned NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table events_waits_summary_global_by_event_name;
 Table	Create Table
 events_waits_summary_global_by_event_name	CREATE TABLE `events_waits_summary_global_by_event_name` (
@@ -412,6 +583,13 @@ file_summary_by_instance	CREATE TABLE `f
   `SUM_NUMBER_OF_BYTES_READ` bigint(20) unsigned NOT NULL,
   `SUM_NUMBER_OF_BYTES_WRITE` bigint(20) unsigned NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table hosts;
+Table	Create Table
+hosts	CREATE TABLE `hosts` (
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `CURRENT_CONNECTIONS` bigint(20) NOT NULL,
+  `TOTAL_CONNECTIONS` bigint(20) NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
 show create table mutex_instances;
 Table	Create Table
 mutex_instances	CREATE TABLE `mutex_instances` (
@@ -661,3 +839,18 @@ threads	CREATE TABLE `threads` (
   `ROLE` varchar(64) DEFAULT NULL,
   `INSTRUMENTED` enum('YES','NO') NOT NULL
 ) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table user_hosts;
+Table	Create Table
+user_hosts	CREATE TABLE `user_hosts` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `HOST` char(60) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `CURRENT_CONNECTIONS` bigint(20) NOT NULL,
+  `TOTAL_CONNECTIONS` bigint(20) NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
+show create table users;
+Table	Create Table
+users	CREATE TABLE `users` (
+  `USER` char(16) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
+  `CURRENT_CONNECTIONS` bigint(20) NOT NULL,
+  `TOTAL_CONNECTIONS` bigint(20) NOT NULL
+) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8


Attachment: [text/bzr-bundle] bzr/marc.alff@oracle.com-20110407230438-fgviz4zkrcuu1ypr.bundle
Thread
bzr commit into mysql-trunk branch (marc.alff:3336) Marc Alff8 Apr