From: Marc Alff Date: April 7 2011 11:04pm Subject: bzr commit into mysql-trunk branch (marc.alff:3336) List-Archive: http://lists.mysql.com/commits/135004 Message-Id: <201104072304.p37N4v4I015930@acsmt356.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3735063315530812264==" --===============3735063315530812264== MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Content-Disposition: inline #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 --===============3735063315530812264== MIME-Version: 1.0 Content-Type: text/bzr-bundle; charset="us-ascii"; name="bzr/marc.alff@stripped" Content-Transfer-Encoding: 7bit Content-Disposition: inline # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: marc.alff@stripped # target_branch: file:///Users/malff/BZR_TREE/mysql-trunk-wl5378/ # testament_sha1: 81f95c76667aac51ed410411127af4d126b1e9f4 # timestamp: 2011-04-08 01:04:45 +0200 # source_branch: file:///Users/malff/BZR_TREE/mysql-trunk/ # base_revision_id: marc.alff@stripped\ # gojppkhsmptzf78d # # Begin bundle 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 CYkYTBJ6nuTuLT4l88lp9IN7yF3JFOFCQ3ee21w= --===============3735063315530812264==--