List:Commits« Previous MessageNext Message »
From:Marc Alff Date:August 26 2011 8:43am
Subject:bzr push into mysql-trunk-wl5863 branch (marc.alff:3407 to 3408) WL#5863
View as plain text  
 3408 Marc Alff	2011-08-26
      WL#5863 PERFORMANCE SCHEMA, NESTED-SET data model
      
      Added the END_EVENT_ID column to events tables.

    modified:
      .bzr-mysql/default.conf
      mysql-test/suite/perfschema/r/func_file_io.result
      mysql-test/suite/perfschema/r/pfs_upgrade.result
      mysql-test/suite/perfschema/r/schema.result
      mysql-test/suite/perfschema/r/start_server_nothing.result
      mysql-test/suite/perfschema/r/table_schema.result
      scripts/mysql_system_tables.sql
      storage/perfschema/pfs.cc
      storage/perfschema/pfs_events.h
      storage/perfschema/pfs_instr.cc
      storage/perfschema/table_events_stages.cc
      storage/perfschema/table_events_stages.h
      storage/perfschema/table_events_statements.cc
      storage/perfschema/table_events_statements.h
      storage/perfschema/table_events_waits.cc
      storage/perfschema/table_events_waits.h
 3407 Tor Didriksen	2011-08-26
       Bug#12744991 - DECIMAL_ROUND(X,D) GIVES WRONG RESULTS WHEN D == N*(-9)
     @ mysql-test/r/func_math.result
        New test cases.
     @ mysql-test/t/func_math.test
        New test cases.
     @ strings/decimal.c
        Round up negative values for scale.
        Move main() program and tests to unit test.
     @ unittest/gunit/CMakeLists.txt
        Add decimal unit test.
     @ unittest/gunit/decimal-t.cc
        New unit test for decimal, based on main program from the decimal implementation.

    added:
      unittest/gunit/decimal-t.cc
    modified:
      mysql-test/r/func_math.result
      mysql-test/t/func_math.test
      strings/decimal.c
      unittest/gunit/CMakeLists.txt
=== modified file '.bzr-mysql/default.conf'
--- a/.bzr-mysql/default.conf	2011-08-20 00:36:03 +0000
+++ b/.bzr-mysql/default.conf	2011-08-26 08:42:40 +0000
@@ -1,4 +1,4 @@
 [MYSQL]
 post_commit_to = "commits@stripped"
 post_push_to = "commits@stripped"
-tree_name = "mysql-trunk"
+tree_name = "mysql-trunk-wl5863"

=== modified file 'mysql-test/suite/perfschema/r/func_file_io.result'
--- a/mysql-test/suite/perfschema/r/func_file_io.result	2011-02-14 14:23:55 +0000
+++ b/mysql-test/suite/perfschema/r/func_file_io.result	2011-08-26 08:42:40 +0000
@@ -67,17 +67,17 @@ SELECT * FROM performance_schema.events_
 WHERE TIMER_WAIT != NULL
 OR TIMER_START != NULL
 OR TIMER_END != NULL;
-THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	NESTING_EVENT_TYPE	OPERATION	NUMBER_OF_BYTES	FLAGS
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	NESTING_EVENT_TYPE	OPERATION	NUMBER_OF_BYTES	FLAGS
 SELECT * FROM performance_schema.events_waits_history
 WHERE TIMER_WAIT != NULL
 OR TIMER_START != NULL
 OR TIMER_END != NULL;
-THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	NESTING_EVENT_TYPE	OPERATION	NUMBER_OF_BYTES	FLAGS
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	NESTING_EVENT_TYPE	OPERATION	NUMBER_OF_BYTES	FLAGS
 SELECT * FROM performance_schema.events_waits_current
 WHERE TIMER_WAIT != NULL
 OR TIMER_START != NULL
 OR TIMER_END != NULL;
-THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	NESTING_EVENT_TYPE	OPERATION	NUMBER_OF_BYTES	FLAGS
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	NESTING_EVENT_TYPE	OPERATION	NUMBER_OF_BYTES	FLAGS
 UPDATE performance_schema.setup_instruments SET timed = 'YES';
 SELECT * FROM t1 WHERE id < 4;
 id	b

=== modified file 'mysql-test/suite/perfschema/r/pfs_upgrade.result'
--- a/mysql-test/suite/perfschema/r/pfs_upgrade.result	2011-08-20 00:25:14 +0000
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade.result	2011-08-26 08:42:40 +0000
@@ -9,54 +9,54 @@ show tables like "user_table";
 Tables_in_performance_schema (user_table)
 user_table
 ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 121: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 145: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 169: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 182: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 222: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 235: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 247: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 256: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 267: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 279: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 292: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 322: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 351: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 360: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 374: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 384: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 394: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 403: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 411: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 420: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 431: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 439: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 484: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 528: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 607: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 627: Table 'threads' already exists
-ERROR 1050 (42S01) at line 642: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 657: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 672: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 685: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 698: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 711: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 725: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 737: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 780: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 823: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 866: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 898: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 930: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 962: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 995: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1026: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1035: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1044: Table 'users' already exists
-ERROR 1050 (42S01) at line 1054: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1474: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 122: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 147: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 172: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 185: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 198: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 211: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 225: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 238: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 250: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 259: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 270: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 282: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 295: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 325: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 354: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 363: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 377: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 387: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 397: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 406: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 414: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 423: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 434: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 442: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 487: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 531: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 610: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 630: Table 'threads' already exists
+ERROR 1050 (42S01) at line 646: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 662: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 678: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 691: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 704: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 717: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 731: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 743: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 787: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 831: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 875: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 907: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 939: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 971: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1004: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1035: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1044: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1053: Table 'users' already exists
+ERROR 1050 (42S01) at line 1063: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1483: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_table";
 Tables_in_performance_schema (user_table)
@@ -70,54 +70,54 @@ show tables like "user_view";
 Tables_in_performance_schema (user_view)
 user_view
 ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 121: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 145: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 169: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 182: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 222: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 235: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 247: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 256: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 267: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 279: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 292: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 322: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 351: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 360: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 374: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 384: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 394: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 403: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 411: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 420: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 431: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 439: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 484: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 528: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 607: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 627: Table 'threads' already exists
-ERROR 1050 (42S01) at line 642: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 657: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 672: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 685: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 698: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 711: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 725: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 737: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 780: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 823: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 866: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 898: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 930: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 962: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 995: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1026: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1035: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1044: Table 'users' already exists
-ERROR 1050 (42S01) at line 1054: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1474: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 122: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 147: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 172: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 185: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 198: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 211: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 225: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 238: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 250: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 259: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 270: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 282: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 295: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 325: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 354: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 363: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 377: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 387: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 397: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 406: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 414: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 423: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 434: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 442: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 487: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 531: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 610: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 630: Table 'threads' already exists
+ERROR 1050 (42S01) at line 646: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 662: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 678: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 691: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 704: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 717: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 731: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 743: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 787: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 831: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 875: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 907: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 939: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 971: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1004: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1035: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1044: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1053: Table 'users' already exists
+ERROR 1050 (42S01) at line 1063: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1483: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 show tables like "user_view";
 Tables_in_performance_schema (user_view)
@@ -129,54 +129,54 @@ create procedure test.user_proc()
 select "Not supposed to be here";
 update mysql.proc set db='performance_schema' where name='user_proc';
 ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 121: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 145: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 169: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 182: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 222: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 235: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 247: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 256: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 267: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 279: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 292: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 322: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 351: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 360: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 374: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 384: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 394: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 403: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 411: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 420: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 431: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 439: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 484: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 528: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 607: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 627: Table 'threads' already exists
-ERROR 1050 (42S01) at line 642: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 657: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 672: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 685: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 698: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 711: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 725: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 737: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 780: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 823: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 866: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 898: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 930: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 962: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 995: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1026: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1035: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1044: Table 'users' already exists
-ERROR 1050 (42S01) at line 1054: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1474: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 122: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 147: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 172: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 185: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 198: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 211: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 225: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 238: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 250: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 259: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 270: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 282: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 295: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 325: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 354: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 363: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 377: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 387: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 397: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 406: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 414: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 423: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 434: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 442: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 487: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 531: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 610: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 630: Table 'threads' already exists
+ERROR 1050 (42S01) at line 646: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 662: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 678: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 691: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 704: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 717: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 731: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 743: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 787: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 831: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 875: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 907: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 939: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 971: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1004: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1035: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1044: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1053: Table 'users' already exists
+ERROR 1050 (42S01) at line 1063: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1483: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -188,54 +188,54 @@ create function test.user_func() returns
 return 0;
 update mysql.proc set db='performance_schema' where name='user_func';
 ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 121: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 145: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 169: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 182: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 222: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 235: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 247: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 256: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 267: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 279: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 292: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 322: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 351: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 360: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 374: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 384: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 394: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 403: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 411: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 420: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 431: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 439: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 484: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 528: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 607: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 627: Table 'threads' already exists
-ERROR 1050 (42S01) at line 642: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 657: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 672: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 685: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 698: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 711: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 725: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 737: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 780: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 823: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 866: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 898: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 930: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 962: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 995: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1026: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1035: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1044: Table 'users' already exists
-ERROR 1050 (42S01) at line 1054: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1474: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 122: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 147: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 172: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 185: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 198: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 211: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 225: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 238: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 250: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 259: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 270: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 282: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 295: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 325: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 354: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 363: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 377: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 387: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 397: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 406: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 414: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 423: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 434: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 442: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 487: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 531: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 610: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 630: Table 'threads' already exists
+ERROR 1050 (42S01) at line 646: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 662: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 678: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 691: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 704: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 717: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 731: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 743: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 787: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 831: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 875: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 907: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 939: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 971: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1004: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1035: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1044: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1053: Table 'users' already exists
+ERROR 1050 (42S01) at line 1063: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1483: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.proc where db='performance_schema';
 name
@@ -247,54 +247,54 @@ create event test.user_event on schedule
 select "not supposed to be here";
 update mysql.event set db='performance_schema' where name='user_event';
 ERROR 1050 (42S01) at line 97: Table 'cond_instances' already exists
-ERROR 1050 (42S01) at line 121: Table 'events_waits_current' already exists
-ERROR 1050 (42S01) at line 145: Table 'events_waits_history' already exists
-ERROR 1050 (42S01) at line 169: Table 'events_waits_history_long' already exists
-ERROR 1050 (42S01) at line 182: Table 'events_waits_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 195: Table 'events_waits_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 208: Table 'events_waits_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 222: Table 'events_waits_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 235: Table 'events_waits_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 247: Table 'events_waits_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 256: Table 'file_instances' already exists
-ERROR 1050 (42S01) at line 267: Table 'file_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 279: Table 'file_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 292: Table 'socket_instances' already exists
-ERROR 1050 (42S01) at line 322: Table 'socket_summary_by_instance' already exists
-ERROR 1050 (42S01) at line 351: Table 'socket_summary_by_event_name' already exists
-ERROR 1050 (42S01) at line 360: Table 'mutex_instances' already exists
-ERROR 1050 (42S01) at line 374: Table 'objects_summary_global_by_type' already exists
-ERROR 1050 (42S01) at line 384: Table 'performance_timers' already exists
-ERROR 1050 (42S01) at line 394: Table 'rwlock_instances' already exists
-ERROR 1050 (42S01) at line 403: Table 'setup_actors' already exists
-ERROR 1050 (42S01) at line 411: Table 'setup_consumers' already exists
-ERROR 1050 (42S01) at line 420: Table 'setup_instruments' already exists
-ERROR 1050 (42S01) at line 431: Table 'setup_objects' already exists
-ERROR 1050 (42S01) at line 439: Table 'setup_timers' already exists
-ERROR 1050 (42S01) at line 484: Table 'table_io_waits_summary_by_index_usage' already exists
-ERROR 1050 (42S01) at line 528: Table 'table_io_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 607: Table 'table_lock_waits_summary_by_table' already exists
-ERROR 1050 (42S01) at line 627: Table 'threads' already exists
-ERROR 1050 (42S01) at line 642: Table 'events_stages_current' already exists
-ERROR 1050 (42S01) at line 657: Table 'events_stages_history' already exists
-ERROR 1050 (42S01) at line 672: Table 'events_stages_history_long' already exists
-ERROR 1050 (42S01) at line 685: Table 'events_stages_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 698: Table 'events_stages_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 711: Table 'events_stages_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 725: Table 'events_stages_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 737: Table 'events_stages_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 780: Table 'events_statements_current' already exists
-ERROR 1050 (42S01) at line 823: Table 'events_statements_history' already exists
-ERROR 1050 (42S01) at line 866: Table 'events_statements_history_long' already exists
-ERROR 1050 (42S01) at line 898: Table 'events_statements_summary_by_thread_by_event_name' already exists
-ERROR 1050 (42S01) at line 930: Table 'events_statements_summary_by_host_by_event_name' already exists
-ERROR 1050 (42S01) at line 962: Table 'events_statements_summary_by_user_by_event_name' already exists
-ERROR 1050 (42S01) at line 995: Table 'events_statements_summary_by_account_by_event_name' already exists
-ERROR 1050 (42S01) at line 1026: Table 'events_statements_summary_global_by_event_name' already exists
-ERROR 1050 (42S01) at line 1035: Table 'hosts' already exists
-ERROR 1050 (42S01) at line 1044: Table 'users' already exists
-ERROR 1050 (42S01) at line 1054: Table 'accounts' already exists
-ERROR 1644 (HY000) at line 1474: Unexpected content found in the performance_schema database.
+ERROR 1050 (42S01) at line 122: Table 'events_waits_current' already exists
+ERROR 1050 (42S01) at line 147: Table 'events_waits_history' already exists
+ERROR 1050 (42S01) at line 172: Table 'events_waits_history_long' already exists
+ERROR 1050 (42S01) at line 185: Table 'events_waits_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 198: Table 'events_waits_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 211: Table 'events_waits_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 225: Table 'events_waits_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 238: Table 'events_waits_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 250: Table 'events_waits_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 259: Table 'file_instances' already exists
+ERROR 1050 (42S01) at line 270: Table 'file_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 282: Table 'file_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 295: Table 'socket_instances' already exists
+ERROR 1050 (42S01) at line 325: Table 'socket_summary_by_instance' already exists
+ERROR 1050 (42S01) at line 354: Table 'socket_summary_by_event_name' already exists
+ERROR 1050 (42S01) at line 363: Table 'mutex_instances' already exists
+ERROR 1050 (42S01) at line 377: Table 'objects_summary_global_by_type' already exists
+ERROR 1050 (42S01) at line 387: Table 'performance_timers' already exists
+ERROR 1050 (42S01) at line 397: Table 'rwlock_instances' already exists
+ERROR 1050 (42S01) at line 406: Table 'setup_actors' already exists
+ERROR 1050 (42S01) at line 414: Table 'setup_consumers' already exists
+ERROR 1050 (42S01) at line 423: Table 'setup_instruments' already exists
+ERROR 1050 (42S01) at line 434: Table 'setup_objects' already exists
+ERROR 1050 (42S01) at line 442: Table 'setup_timers' already exists
+ERROR 1050 (42S01) at line 487: Table 'table_io_waits_summary_by_index_usage' already exists
+ERROR 1050 (42S01) at line 531: Table 'table_io_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 610: Table 'table_lock_waits_summary_by_table' already exists
+ERROR 1050 (42S01) at line 630: Table 'threads' already exists
+ERROR 1050 (42S01) at line 646: Table 'events_stages_current' already exists
+ERROR 1050 (42S01) at line 662: Table 'events_stages_history' already exists
+ERROR 1050 (42S01) at line 678: Table 'events_stages_history_long' already exists
+ERROR 1050 (42S01) at line 691: Table 'events_stages_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 704: Table 'events_stages_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 717: Table 'events_stages_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 731: Table 'events_stages_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 743: Table 'events_stages_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 787: Table 'events_statements_current' already exists
+ERROR 1050 (42S01) at line 831: Table 'events_statements_history' already exists
+ERROR 1050 (42S01) at line 875: Table 'events_statements_history_long' already exists
+ERROR 1050 (42S01) at line 907: Table 'events_statements_summary_by_thread_by_event_name' already exists
+ERROR 1050 (42S01) at line 939: Table 'events_statements_summary_by_host_by_event_name' already exists
+ERROR 1050 (42S01) at line 971: Table 'events_statements_summary_by_user_by_event_name' already exists
+ERROR 1050 (42S01) at line 1004: Table 'events_statements_summary_by_account_by_event_name' already exists
+ERROR 1050 (42S01) at line 1035: Table 'events_statements_summary_global_by_event_name' already exists
+ERROR 1050 (42S01) at line 1044: Table 'hosts' already exists
+ERROR 1050 (42S01) at line 1053: Table 'users' already exists
+ERROR 1050 (42S01) at line 1063: Table 'accounts' already exists
+ERROR 1644 (HY000) at line 1483: Unexpected content found in the performance_schema database.
 FATAL ERROR: Upgrade failed
 select name from mysql.event where db='performance_schema';
 name

=== modified file 'mysql-test/suite/perfschema/r/schema.result'
--- a/mysql-test/suite/perfschema/r/schema.result	2011-08-11 03:11:58 +0000
+++ b/mysql-test/suite/perfschema/r/schema.result	2011-08-26 08:42:40 +0000
@@ -74,6 +74,7 @@ Table	Create Table
 events_stages_current	CREATE TABLE `events_stages_current` (
   `THREAD_ID` int(11) NOT NULL,
   `EVENT_ID` bigint(20) unsigned NOT NULL,
+  `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
   `EVENT_NAME` varchar(128) NOT NULL,
   `SOURCE` varchar(64) DEFAULT NULL,
   `TIMER_START` bigint(20) unsigned DEFAULT NULL,
@@ -87,6 +88,7 @@ Table	Create Table
 events_stages_history	CREATE TABLE `events_stages_history` (
   `THREAD_ID` int(11) NOT NULL,
   `EVENT_ID` bigint(20) unsigned NOT NULL,
+  `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
   `EVENT_NAME` varchar(128) NOT NULL,
   `SOURCE` varchar(64) DEFAULT NULL,
   `TIMER_START` bigint(20) unsigned DEFAULT NULL,
@@ -100,6 +102,7 @@ Table	Create Table
 events_stages_history_long	CREATE TABLE `events_stages_history_long` (
   `THREAD_ID` int(11) NOT NULL,
   `EVENT_ID` bigint(20) unsigned NOT NULL,
+  `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
   `EVENT_NAME` varchar(128) NOT NULL,
   `SOURCE` varchar(64) DEFAULT NULL,
   `TIMER_START` bigint(20) unsigned DEFAULT NULL,
@@ -168,6 +171,7 @@ Table	Create Table
 events_statements_current	CREATE TABLE `events_statements_current` (
   `THREAD_ID` int(11) NOT NULL,
   `EVENT_ID` bigint(20) unsigned NOT NULL,
+  `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
   `EVENT_NAME` varchar(128) NOT NULL,
   `SOURCE` varchar(64) DEFAULT NULL,
   `TIMER_START` bigint(20) unsigned DEFAULT NULL,
@@ -209,6 +213,7 @@ Table	Create Table
 events_statements_history	CREATE TABLE `events_statements_history` (
   `THREAD_ID` int(11) NOT NULL,
   `EVENT_ID` bigint(20) unsigned NOT NULL,
+  `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
   `EVENT_NAME` varchar(128) NOT NULL,
   `SOURCE` varchar(64) DEFAULT NULL,
   `TIMER_START` bigint(20) unsigned DEFAULT NULL,
@@ -250,6 +255,7 @@ Table	Create Table
 events_statements_history_long	CREATE TABLE `events_statements_history_long` (
   `THREAD_ID` int(11) NOT NULL,
   `EVENT_ID` bigint(20) unsigned NOT NULL,
+  `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
   `EVENT_NAME` varchar(128) NOT NULL,
   `SOURCE` varchar(64) DEFAULT NULL,
   `TIMER_START` bigint(20) unsigned DEFAULT NULL,
@@ -441,6 +447,7 @@ Table	Create Table
 events_waits_current	CREATE TABLE `events_waits_current` (
   `THREAD_ID` int(11) NOT NULL,
   `EVENT_ID` bigint(20) unsigned NOT NULL,
+  `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
   `EVENT_NAME` varchar(128) NOT NULL,
   `SOURCE` varchar(64) DEFAULT NULL,
   `TIMER_START` bigint(20) unsigned DEFAULT NULL,
@@ -463,6 +470,7 @@ Table	Create Table
 events_waits_history	CREATE TABLE `events_waits_history` (
   `THREAD_ID` int(11) NOT NULL,
   `EVENT_ID` bigint(20) unsigned NOT NULL,
+  `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
   `EVENT_NAME` varchar(128) NOT NULL,
   `SOURCE` varchar(64) DEFAULT NULL,
   `TIMER_START` bigint(20) unsigned DEFAULT NULL,
@@ -485,6 +493,7 @@ Table	Create Table
 events_waits_history_long	CREATE TABLE `events_waits_history_long` (
   `THREAD_ID` int(11) NOT NULL,
   `EVENT_ID` bigint(20) unsigned NOT NULL,
+  `END_EVENT_ID` bigint(20) unsigned DEFAULT NULL,
   `EVENT_NAME` varchar(128) NOT NULL,
   `SOURCE` varchar(64) DEFAULT NULL,
   `TIMER_START` bigint(20) unsigned DEFAULT NULL,

=== modified file 'mysql-test/suite/perfschema/r/start_server_nothing.result'
--- a/mysql-test/suite/perfschema/r/start_server_nothing.result	2011-08-11 03:11:58 +0000
+++ b/mysql-test/suite/perfschema/r/start_server_nothing.result	2011-08-26 08:42:40 +0000
@@ -165,11 +165,11 @@ USER	HOST	CURRENT_CONNECTIONS	TOTAL_CONN
 select * from performance_schema.cond_instances;
 NAME	OBJECT_INSTANCE_BEGIN
 select * from performance_schema.events_stages_current;
-THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	NESTING_EVENT_ID	NESTING_EVENT_TYPE
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	NESTING_EVENT_ID	NESTING_EVENT_TYPE
 select * from performance_schema.events_stages_history;
-THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	NESTING_EVENT_ID	NESTING_EVENT_TYPE
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	NESTING_EVENT_ID	NESTING_EVENT_TYPE
 select * from performance_schema.events_stages_history_long;
-THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	NESTING_EVENT_ID	NESTING_EVENT_TYPE
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	NESTING_EVENT_ID	NESTING_EVENT_TYPE
 select * from performance_schema.events_stages_summary_by_account_by_event_name;
 USER	HOST	EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT
 select * from performance_schema.events_stages_summary_by_host_by_event_name;
@@ -181,11 +181,11 @@ USER	EVENT_NAME	COUNT_STAR	SUM_TIMER_WAI
 select * from performance_schema.events_stages_summary_global_by_event_name;
 EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT
 select * from performance_schema.events_statements_current;
-THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	LOCK_TIME	SQL_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	MYSQL_ERRNO	RETURNED_SQLSTATE	MESSAGE_TEXT	ERRORS	WARNINGS	ROWS_AFFECTED	ROWS_SENT	ROWS_EXAMINED	CREATED_TMP_DISK_TABLES	CREATED_TMP_TABLES	SELECT_FULL_JOIN	SELECT_FULL_RANGE_JOIN	SELECT_RANGE	SELECT_RANGE_CHECK	SELECT_SCAN	SORT_MERGE_PASSES	SORT_RANGE	SORT_ROWS	SORT_SCAN	NO_INDEX_USED	NO_GOOD_INDEX_USED	NESTING_EVENT_ID	NESTING_EVENT_TYPE
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	LOCK_TIME	SQL_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	MYSQL_ERRNO	RETURNED_SQLSTATE	MESSAGE_TEXT	ERRORS	WARNINGS	ROWS_AFFECTED	ROWS_SENT	ROWS_EXAMINED	CREATED_TMP_DISK_TABLES	CREATED_TMP_TABLES	SELECT_FULL_JOIN	SELECT_FULL_RANGE_JOIN	SELECT_RANGE	SELECT_RANGE_CHECK	SELECT_SCAN	SORT_MERGE_PASSES	SORT_RANGE	SORT_ROWS	SORT_SCAN	NO_INDEX_USED	NO_GOOD_INDEX_USED	NESTING_EVENT_ID	NESTING_EVENT_TYPE
 select * from performance_schema.events_statements_history;
-THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	LOCK_TIME	SQL_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	MYSQL_ERRNO	RETURNED_SQLSTATE	MESSAGE_TEXT	ERRORS	WARNINGS	ROWS_AFFECTED	ROWS_SENT	ROWS_EXAMINED	CREATED_TMP_DISK_TABLES	CREATED_TMP_TABLES	SELECT_FULL_JOIN	SELECT_FULL_RANGE_JOIN	SELECT_RANGE	SELECT_RANGE_CHECK	SELECT_SCAN	SORT_MERGE_PASSES	SORT_RANGE	SORT_ROWS	SORT_SCAN	NO_INDEX_USED	NO_GOOD_INDEX_USED	NESTING_EVENT_ID	NESTING_EVENT_TYPE
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	LOCK_TIME	SQL_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	MYSQL_ERRNO	RETURNED_SQLSTATE	MESSAGE_TEXT	ERRORS	WARNINGS	ROWS_AFFECTED	ROWS_SENT	ROWS_EXAMINED	CREATED_TMP_DISK_TABLES	CREATED_TMP_TABLES	SELECT_FULL_JOIN	SELECT_FULL_RANGE_JOIN	SELECT_RANGE	SELECT_RANGE_CHECK	SELECT_SCAN	SORT_MERGE_PASSES	SORT_RANGE	SORT_ROWS	SORT_SCAN	NO_INDEX_USED	NO_GOOD_INDEX_USED	NESTING_EVENT_ID	NESTING_EVENT_TYPE
 select * from performance_schema.events_statements_history_long;
-THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	LOCK_TIME	SQL_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	MYSQL_ERRNO	RETURNED_SQLSTATE	MESSAGE_TEXT	ERRORS	WARNINGS	ROWS_AFFECTED	ROWS_SENT	ROWS_EXAMINED	CREATED_TMP_DISK_TABLES	CREATED_TMP_TABLES	SELECT_FULL_JOIN	SELECT_FULL_RANGE_JOIN	SELECT_RANGE	SELECT_RANGE_CHECK	SELECT_SCAN	SORT_MERGE_PASSES	SORT_RANGE	SORT_ROWS	SORT_SCAN	NO_INDEX_USED	NO_GOOD_INDEX_USED	NESTING_EVENT_ID	NESTING_EVENT_TYPE
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	LOCK_TIME	SQL_TEXT	CURRENT_SCHEMA	OBJECT_TYPE	OBJECT_SCHEMA	OBJECT_NAME	OBJECT_INSTANCE_BEGIN	MYSQL_ERRNO	RETURNED_SQLSTATE	MESSAGE_TEXT	ERRORS	WARNINGS	ROWS_AFFECTED	ROWS_SENT	ROWS_EXAMINED	CREATED_TMP_DISK_TABLES	CREATED_TMP_TABLES	SELECT_FULL_JOIN	SELECT_FULL_RANGE_JOIN	SELECT_RANGE	SELECT_RANGE_CHECK	SELECT_SCAN	SORT_MERGE_PASSES	SORT_RANGE	SORT_ROWS	SORT_SCAN	NO_INDEX_USED	NO_GOOD_INDEX_USED	NESTING_EVENT_ID	NESTING_EVENT_TYPE
 select * from performance_schema.events_statements_summary_by_account_by_event_name;
 USER	HOST	EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	SUM_LOCK_TIME	SUM_ERRORS	SUM_WARNINGS	SUM_ROWS_AFFECTED	SUM_ROWS_SENT	SUM_ROWS_EXAMINED	SUM_CREATED_TMP_DISK_TABLES	SUM_CREATED_TMP_TABLES	SUM_SELECT_FULL_JOIN	SUM_SELECT_FULL_RANGE_JOIN	SUM_SELECT_RANGE	SUM_SELECT_RANGE_CHECK	SUM_SELECT_SCAN	SUM_SORT_MERGE_PASSES	SUM_SORT_RANGE	SUM_SORT_ROWS	SUM_SORT_SCAN	SUM_NO_INDEX_USED	SUM_NO_GOOD_INDEX_USED
 select * from performance_schema.events_statements_summary_by_host_by_event_name;
@@ -197,11 +197,11 @@ USER	EVENT_NAME	COUNT_STAR	SUM_TIMER_WAI
 select * from performance_schema.events_statements_summary_global_by_event_name;
 EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT	SUM_LOCK_TIME	SUM_ERRORS	SUM_WARNINGS	SUM_ROWS_AFFECTED	SUM_ROWS_SENT	SUM_ROWS_EXAMINED	SUM_CREATED_TMP_DISK_TABLES	SUM_CREATED_TMP_TABLES	SUM_SELECT_FULL_JOIN	SUM_SELECT_FULL_RANGE_JOIN	SUM_SELECT_RANGE	SUM_SELECT_RANGE_CHECK	SUM_SELECT_SCAN	SUM_SORT_MERGE_PASSES	SUM_SORT_RANGE	SUM_SORT_ROWS	SUM_SORT_SCAN	SUM_NO_INDEX_USED	SUM_NO_GOOD_INDEX_USED
 select * from performance_schema.events_waits_current;
-THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	NESTING_EVENT_TYPE	OPERATION	NUMBER_OF_BYTES	FLAGS
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	NESTING_EVENT_TYPE	OPERATION	NUMBER_OF_BYTES	FLAGS
 select * from performance_schema.events_waits_history;
-THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	NESTING_EVENT_TYPE	OPERATION	NUMBER_OF_BYTES	FLAGS
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	NESTING_EVENT_TYPE	OPERATION	NUMBER_OF_BYTES	FLAGS
 select * from performance_schema.events_waits_history_long;
-THREAD_ID	EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	NESTING_EVENT_TYPE	OPERATION	NUMBER_OF_BYTES	FLAGS
+THREAD_ID	EVENT_ID	END_EVENT_ID	EVENT_NAME	SOURCE	TIMER_START	TIMER_END	TIMER_WAIT	SPINS	OBJECT_SCHEMA	OBJECT_NAME	INDEX_NAME	OBJECT_TYPE	OBJECT_INSTANCE_BEGIN	NESTING_EVENT_ID	NESTING_EVENT_TYPE	OPERATION	NUMBER_OF_BYTES	FLAGS
 select * from performance_schema.events_waits_summary_by_account_by_event_name;
 USER	HOST	EVENT_NAME	COUNT_STAR	SUM_TIMER_WAIT	MIN_TIMER_WAIT	AVG_TIMER_WAIT	MAX_TIMER_WAIT
 select * from performance_schema.events_waits_summary_by_host_by_event_name;

=== modified file 'mysql-test/suite/perfschema/r/table_schema.result'
--- a/mysql-test/suite/perfschema/r/table_schema.result	2011-08-11 03:11:58 +0000
+++ b/mysql-test/suite/perfschema/r/table_schema.result	2011-08-26 08:42:40 +0000
@@ -9,31 +9,34 @@ def	performance_schema	cond_instances	NA
 def	performance_schema	cond_instances	OBJECT_INSTANCE_BEGIN	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
 def	performance_schema	events_stages_current	THREAD_ID	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
 def	performance_schema	events_stages_current	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_stages_current	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
-def	performance_schema	events_stages_current	SOURCE	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_stages_current	TIMER_START	5	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_stages_current	TIMER_END	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_stages_current	TIMER_WAIT	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_stages_current	NESTING_EVENT_ID	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_stages_current	NESTING_EVENT_TYPE	9	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
+def	performance_schema	events_stages_current	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_stages_current	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
+def	performance_schema	events_stages_current	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_stages_current	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_stages_current	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_stages_current	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_stages_current	NESTING_EVENT_ID	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_stages_current	NESTING_EVENT_TYPE	10	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
 def	performance_schema	events_stages_history	THREAD_ID	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
 def	performance_schema	events_stages_history	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_stages_history	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
-def	performance_schema	events_stages_history	SOURCE	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_stages_history	TIMER_START	5	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_stages_history	TIMER_END	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_stages_history	TIMER_WAIT	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_stages_history	NESTING_EVENT_ID	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_stages_history	NESTING_EVENT_TYPE	9	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
+def	performance_schema	events_stages_history	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_stages_history	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
+def	performance_schema	events_stages_history	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_stages_history	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_stages_history	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_stages_history	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_stages_history	NESTING_EVENT_ID	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_stages_history	NESTING_EVENT_TYPE	10	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
 def	performance_schema	events_stages_history_long	THREAD_ID	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
 def	performance_schema	events_stages_history_long	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_stages_history_long	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
-def	performance_schema	events_stages_history_long	SOURCE	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_stages_history_long	TIMER_START	5	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_stages_history_long	TIMER_END	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_stages_history_long	TIMER_WAIT	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_stages_history_long	NESTING_EVENT_ID	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_stages_history_long	NESTING_EVENT_TYPE	9	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
+def	performance_schema	events_stages_history_long	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_stages_history_long	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
+def	performance_schema	events_stages_history_long	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_stages_history_long	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_stages_history_long	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_stages_history_long	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_stages_history_long	NESTING_EVENT_ID	9	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_stages_history_long	NESTING_EVENT_TYPE	10	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
 def	performance_schema	events_stages_summary_by_account_by_event_name	USER	1	NULL	YES	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)			select,insert,update,references	
 def	performance_schema	events_stages_summary_by_account_by_event_name	HOST	2	NULL	YES	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references	
 def	performance_schema	events_stages_summary_by_account_by_event_name	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
@@ -71,115 +74,118 @@ def	performance_schema	events_stages_sum
 def	performance_schema	events_stages_summary_global_by_event_name	MAX_TIMER_WAIT	6	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
 def	performance_schema	events_statements_current	THREAD_ID	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
 def	performance_schema	events_statements_current	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
-def	performance_schema	events_statements_current	SOURCE	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_statements_current	TIMER_START	5	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	TIMER_END	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	TIMER_WAIT	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	LOCK_TIME	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	SQL_TEXT	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references	
-def	performance_schema	events_statements_current	CURRENT_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_statements_current	OBJECT_TYPE	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_statements_current	OBJECT_SCHEMA	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_statements_current	OBJECT_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_statements_current	OBJECT_INSTANCE_BEGIN	14	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	MYSQL_ERRNO	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-def	performance_schema	events_statements_current	RETURNED_SQLSTATE	16	NULL	YES	varchar	5	15	NULL	NULL	utf8	utf8_general_ci	varchar(5)			select,insert,update,references	
-def	performance_schema	events_statements_current	MESSAGE_TEXT	17	NULL	YES	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
-def	performance_schema	events_statements_current	ERRORS	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	WARNINGS	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	ROWS_AFFECTED	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	ROWS_SENT	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	ROWS_EXAMINED	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	CREATED_TMP_DISK_TABLES	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	CREATED_TMP_TABLES	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	SELECT_FULL_JOIN	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	SELECT_FULL_RANGE_JOIN	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	SELECT_RANGE	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	SELECT_RANGE_CHECK	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	SELECT_SCAN	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	SORT_MERGE_PASSES	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	SORT_RANGE	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	SORT_ROWS	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	SORT_SCAN	33	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	NO_INDEX_USED	34	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	NO_GOOD_INDEX_USED	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	NESTING_EVENT_ID	36	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_current	NESTING_EVENT_TYPE	37	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
+def	performance_schema	events_statements_current	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
+def	performance_schema	events_statements_current	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_statements_current	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	LOCK_TIME	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	SQL_TEXT	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references	
+def	performance_schema	events_statements_current	CURRENT_SCHEMA	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_statements_current	OBJECT_TYPE	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_statements_current	OBJECT_SCHEMA	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_statements_current	OBJECT_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_statements_current	OBJECT_INSTANCE_BEGIN	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	MYSQL_ERRNO	16	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+def	performance_schema	events_statements_current	RETURNED_SQLSTATE	17	NULL	YES	varchar	5	15	NULL	NULL	utf8	utf8_general_ci	varchar(5)			select,insert,update,references	
+def	performance_schema	events_statements_current	MESSAGE_TEXT	18	NULL	YES	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
+def	performance_schema	events_statements_current	ERRORS	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	WARNINGS	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	ROWS_AFFECTED	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	ROWS_SENT	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	ROWS_EXAMINED	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	CREATED_TMP_DISK_TABLES	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	CREATED_TMP_TABLES	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	SELECT_FULL_JOIN	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	SELECT_FULL_RANGE_JOIN	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	SELECT_RANGE	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	SELECT_RANGE_CHECK	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	SELECT_SCAN	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	SORT_MERGE_PASSES	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	SORT_RANGE	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	SORT_ROWS	33	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	SORT_SCAN	34	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	NO_INDEX_USED	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	NO_GOOD_INDEX_USED	36	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	NESTING_EVENT_ID	37	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_current	NESTING_EVENT_TYPE	38	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
 def	performance_schema	events_statements_history	THREAD_ID	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
 def	performance_schema	events_statements_history	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
-def	performance_schema	events_statements_history	SOURCE	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_statements_history	TIMER_START	5	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	TIMER_END	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	TIMER_WAIT	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	LOCK_TIME	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	SQL_TEXT	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references	
-def	performance_schema	events_statements_history	CURRENT_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_statements_history	OBJECT_TYPE	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_statements_history	OBJECT_SCHEMA	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_statements_history	OBJECT_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_statements_history	OBJECT_INSTANCE_BEGIN	14	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	MYSQL_ERRNO	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-def	performance_schema	events_statements_history	RETURNED_SQLSTATE	16	NULL	YES	varchar	5	15	NULL	NULL	utf8	utf8_general_ci	varchar(5)			select,insert,update,references	
-def	performance_schema	events_statements_history	MESSAGE_TEXT	17	NULL	YES	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
-def	performance_schema	events_statements_history	ERRORS	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	WARNINGS	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	ROWS_AFFECTED	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	ROWS_SENT	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	ROWS_EXAMINED	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	CREATED_TMP_DISK_TABLES	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	CREATED_TMP_TABLES	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	SELECT_FULL_JOIN	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	SELECT_FULL_RANGE_JOIN	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	SELECT_RANGE	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	SELECT_RANGE_CHECK	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	SELECT_SCAN	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	SORT_MERGE_PASSES	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	SORT_RANGE	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	SORT_ROWS	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	SORT_SCAN	33	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	NO_INDEX_USED	34	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	NO_GOOD_INDEX_USED	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	NESTING_EVENT_ID	36	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history	NESTING_EVENT_TYPE	37	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
+def	performance_schema	events_statements_history	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
+def	performance_schema	events_statements_history	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_statements_history	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	LOCK_TIME	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	SQL_TEXT	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references	
+def	performance_schema	events_statements_history	CURRENT_SCHEMA	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_statements_history	OBJECT_TYPE	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_statements_history	OBJECT_SCHEMA	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_statements_history	OBJECT_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_statements_history	OBJECT_INSTANCE_BEGIN	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	MYSQL_ERRNO	16	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+def	performance_schema	events_statements_history	RETURNED_SQLSTATE	17	NULL	YES	varchar	5	15	NULL	NULL	utf8	utf8_general_ci	varchar(5)			select,insert,update,references	
+def	performance_schema	events_statements_history	MESSAGE_TEXT	18	NULL	YES	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
+def	performance_schema	events_statements_history	ERRORS	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	WARNINGS	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	ROWS_AFFECTED	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	ROWS_SENT	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	ROWS_EXAMINED	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	CREATED_TMP_DISK_TABLES	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	CREATED_TMP_TABLES	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	SELECT_FULL_JOIN	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	SELECT_FULL_RANGE_JOIN	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	SELECT_RANGE	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	SELECT_RANGE_CHECK	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	SELECT_SCAN	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	SORT_MERGE_PASSES	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	SORT_RANGE	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	SORT_ROWS	33	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	SORT_SCAN	34	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	NO_INDEX_USED	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	NO_GOOD_INDEX_USED	36	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	NESTING_EVENT_ID	37	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history	NESTING_EVENT_TYPE	38	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
 def	performance_schema	events_statements_history_long	THREAD_ID	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
 def	performance_schema	events_statements_history_long	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
-def	performance_schema	events_statements_history_long	SOURCE	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_statements_history_long	TIMER_START	5	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	TIMER_END	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	TIMER_WAIT	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	LOCK_TIME	8	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	SQL_TEXT	9	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references	
-def	performance_schema	events_statements_history_long	CURRENT_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_statements_history_long	OBJECT_TYPE	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_statements_history_long	OBJECT_SCHEMA	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_statements_history_long	OBJECT_NAME	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_statements_history_long	OBJECT_INSTANCE_BEGIN	14	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	MYSQL_ERRNO	15	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
-def	performance_schema	events_statements_history_long	RETURNED_SQLSTATE	16	NULL	YES	varchar	5	15	NULL	NULL	utf8	utf8_general_ci	varchar(5)			select,insert,update,references	
-def	performance_schema	events_statements_history_long	MESSAGE_TEXT	17	NULL	YES	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
-def	performance_schema	events_statements_history_long	ERRORS	18	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	WARNINGS	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	ROWS_AFFECTED	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	ROWS_SENT	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	ROWS_EXAMINED	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	CREATED_TMP_DISK_TABLES	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	CREATED_TMP_TABLES	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	SELECT_FULL_JOIN	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	SELECT_FULL_RANGE_JOIN	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	SELECT_RANGE	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	SELECT_RANGE_CHECK	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	SELECT_SCAN	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	SORT_MERGE_PASSES	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	SORT_RANGE	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	SORT_ROWS	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	SORT_SCAN	33	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	NO_INDEX_USED	34	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	NO_GOOD_INDEX_USED	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	NESTING_EVENT_ID	36	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_statements_history_long	NESTING_EVENT_TYPE	37	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
+def	performance_schema	events_statements_history_long	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
+def	performance_schema	events_statements_history_long	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_statements_history_long	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	LOCK_TIME	9	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	SQL_TEXT	10	NULL	YES	longtext	4294967295	4294967295	NULL	NULL	utf8	utf8_general_ci	longtext			select,insert,update,references	
+def	performance_schema	events_statements_history_long	CURRENT_SCHEMA	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_statements_history_long	OBJECT_TYPE	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_statements_history_long	OBJECT_SCHEMA	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_statements_history_long	OBJECT_NAME	14	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_statements_history_long	OBJECT_INSTANCE_BEGIN	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	MYSQL_ERRNO	16	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
+def	performance_schema	events_statements_history_long	RETURNED_SQLSTATE	17	NULL	YES	varchar	5	15	NULL	NULL	utf8	utf8_general_ci	varchar(5)			select,insert,update,references	
+def	performance_schema	events_statements_history_long	MESSAGE_TEXT	18	NULL	YES	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
+def	performance_schema	events_statements_history_long	ERRORS	19	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	WARNINGS	20	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	ROWS_AFFECTED	21	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	ROWS_SENT	22	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	ROWS_EXAMINED	23	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	CREATED_TMP_DISK_TABLES	24	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	CREATED_TMP_TABLES	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	SELECT_FULL_JOIN	26	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	SELECT_FULL_RANGE_JOIN	27	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	SELECT_RANGE	28	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	SELECT_RANGE_CHECK	29	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	SELECT_SCAN	30	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	SORT_MERGE_PASSES	31	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	SORT_RANGE	32	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	SORT_ROWS	33	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	SORT_SCAN	34	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	NO_INDEX_USED	35	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	NO_GOOD_INDEX_USED	36	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	NESTING_EVENT_ID	37	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_statements_history_long	NESTING_EVENT_TYPE	38	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
 def	performance_schema	events_statements_summary_by_account_by_event_name	USER	1	NULL	YES	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)			select,insert,update,references	
 def	performance_schema	events_statements_summary_by_account_by_event_name	HOST	2	NULL	YES	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references	
 def	performance_schema	events_statements_summary_by_account_by_event_name	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
@@ -312,58 +318,61 @@ def	performance_schema	events_statements
 def	performance_schema	events_statements_summary_global_by_event_name	SUM_NO_GOOD_INDEX_USED	25	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
 def	performance_schema	events_waits_current	THREAD_ID	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
 def	performance_schema	events_waits_current	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_current	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
-def	performance_schema	events_waits_current	SOURCE	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_waits_current	TIMER_START	5	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_current	TIMER_END	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_current	TIMER_WAIT	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_current	SPINS	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_current	OBJECT_SCHEMA	9	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_waits_current	OBJECT_NAME	10	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references	
-def	performance_schema	events_waits_current	INDEX_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_waits_current	OBJECT_TYPE	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_waits_current	OBJECT_INSTANCE_BEGIN	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_current	NESTING_EVENT_ID	14	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_current	NESTING_EVENT_TYPE	15	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
-def	performance_schema	events_waits_current	OPERATION	16	NULL	NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references	
-def	performance_schema	events_waits_current	NUMBER_OF_BYTES	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	events_waits_current	FLAGS	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_current	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_current	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
+def	performance_schema	events_waits_current	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_waits_current	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_current	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_current	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_current	SPINS	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_current	OBJECT_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_waits_current	OBJECT_NAME	11	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references	
+def	performance_schema	events_waits_current	INDEX_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_waits_current	OBJECT_TYPE	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_waits_current	OBJECT_INSTANCE_BEGIN	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_current	NESTING_EVENT_ID	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_current	NESTING_EVENT_TYPE	16	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
+def	performance_schema	events_waits_current	OPERATION	17	NULL	NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references	
+def	performance_schema	events_waits_current	NUMBER_OF_BYTES	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	events_waits_current	FLAGS	19	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
 def	performance_schema	events_waits_history	THREAD_ID	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
 def	performance_schema	events_waits_history	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_history	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
-def	performance_schema	events_waits_history	SOURCE	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_waits_history	TIMER_START	5	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_history	TIMER_END	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_history	TIMER_WAIT	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_history	SPINS	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_history	OBJECT_SCHEMA	9	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_waits_history	OBJECT_NAME	10	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references	
-def	performance_schema	events_waits_history	INDEX_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_waits_history	OBJECT_TYPE	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_waits_history	OBJECT_INSTANCE_BEGIN	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_history	NESTING_EVENT_ID	14	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_history	NESTING_EVENT_TYPE	15	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
-def	performance_schema	events_waits_history	OPERATION	16	NULL	NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references	
-def	performance_schema	events_waits_history	NUMBER_OF_BYTES	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	events_waits_history	FLAGS	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
+def	performance_schema	events_waits_history	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_waits_history	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history	SPINS	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history	OBJECT_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_waits_history	OBJECT_NAME	11	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references	
+def	performance_schema	events_waits_history	INDEX_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_waits_history	OBJECT_TYPE	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_waits_history	OBJECT_INSTANCE_BEGIN	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history	NESTING_EVENT_ID	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history	NESTING_EVENT_TYPE	16	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
+def	performance_schema	events_waits_history	OPERATION	17	NULL	NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references	
+def	performance_schema	events_waits_history	NUMBER_OF_BYTES	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	events_waits_history	FLAGS	19	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
 def	performance_schema	events_waits_history_long	THREAD_ID	1	NULL	NO	int	NULL	NULL	10	0	NULL	NULL	int(11)			select,insert,update,references	
 def	performance_schema	events_waits_history_long	EVENT_ID	2	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_history_long	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
-def	performance_schema	events_waits_history_long	SOURCE	4	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_waits_history_long	TIMER_START	5	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_history_long	TIMER_END	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_history_long	TIMER_WAIT	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_history_long	SPINS	8	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_history_long	OBJECT_SCHEMA	9	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_waits_history_long	OBJECT_NAME	10	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references	
-def	performance_schema	events_waits_history_long	INDEX_NAME	11	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_waits_history_long	OBJECT_TYPE	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
-def	performance_schema	events_waits_history_long	OBJECT_INSTANCE_BEGIN	13	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_history_long	NESTING_EVENT_ID	14	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
-def	performance_schema	events_waits_history_long	NESTING_EVENT_TYPE	15	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
-def	performance_schema	events_waits_history_long	OPERATION	16	NULL	NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references	
-def	performance_schema	events_waits_history_long	NUMBER_OF_BYTES	17	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references	
-def	performance_schema	events_waits_history_long	FLAGS	18	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history_long	END_EVENT_ID	3	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history_long	EVENT_NAME	4	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	
+def	performance_schema	events_waits_history_long	SOURCE	5	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_waits_history_long	TIMER_START	6	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history_long	TIMER_END	7	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history_long	TIMER_WAIT	8	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history_long	SPINS	9	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history_long	OBJECT_SCHEMA	10	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_waits_history_long	OBJECT_NAME	11	NULL	YES	varchar	512	1536	NULL	NULL	utf8	utf8_general_ci	varchar(512)			select,insert,update,references	
+def	performance_schema	events_waits_history_long	INDEX_NAME	12	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_waits_history_long	OBJECT_TYPE	13	NULL	YES	varchar	64	192	NULL	NULL	utf8	utf8_general_ci	varchar(64)			select,insert,update,references	
+def	performance_schema	events_waits_history_long	OBJECT_INSTANCE_BEGIN	14	NULL	NO	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history_long	NESTING_EVENT_ID	15	NULL	YES	bigint	NULL	NULL	20	0	NULL	NULL	bigint(20) unsigned			select,insert,update,references	
+def	performance_schema	events_waits_history_long	NESTING_EVENT_TYPE	16	NULL	YES	enum	9	27	NULL	NULL	utf8	utf8_general_ci	enum('STATEMENT','STAGE','WAIT')			select,insert,update,references	
+def	performance_schema	events_waits_history_long	OPERATION	17	NULL	NO	varchar	32	96	NULL	NULL	utf8	utf8_general_ci	varchar(32)			select,insert,update,references	
+def	performance_schema	events_waits_history_long	NUMBER_OF_BYTES	18	NULL	YES	bigint	NULL	NULL	19	0	NULL	NULL	bigint(20)			select,insert,update,references	
+def	performance_schema	events_waits_history_long	FLAGS	19	NULL	YES	int	NULL	NULL	10	0	NULL	NULL	int(10) unsigned			select,insert,update,references	
 def	performance_schema	events_waits_summary_by_account_by_event_name	USER	1	NULL	YES	char	16	48	NULL	NULL	utf8	utf8_bin	char(16)			select,insert,update,references	
 def	performance_schema	events_waits_summary_by_account_by_event_name	HOST	2	NULL	YES	char	60	180	NULL	NULL	utf8	utf8_bin	char(60)			select,insert,update,references	
 def	performance_schema	events_waits_summary_by_account_by_event_name	EVENT_NAME	3	NULL	NO	varchar	128	384	NULL	NULL	utf8	utf8_general_ci	varchar(128)			select,insert,update,references	

=== modified file 'scripts/mysql_system_tables.sql'
--- a/scripts/mysql_system_tables.sql	2011-08-20 00:25:14 +0000
+++ b/scripts/mysql_system_tables.sql	2011-08-26 08:42:40 +0000
@@ -220,6 +220,7 @@ DROP PREPARE stmt;
 SET @cmd="CREATE TABLE performance_schema.events_waits_current("
   "THREAD_ID INTEGER not null,"
   "EVENT_ID BIGINT unsigned not null,"
+  "END_EVENT_ID BIGINT unsigned,"
   "EVENT_NAME VARCHAR(128) not null,"
   "SOURCE VARCHAR(64),"
   "TIMER_START BIGINT unsigned,"
@@ -250,6 +251,7 @@ DROP PREPARE stmt;
 SET @cmd="CREATE TABLE performance_schema.events_waits_history("
   "THREAD_ID INTEGER not null,"
   "EVENT_ID BIGINT unsigned not null,"
+  "END_EVENT_ID BIGINT unsigned,"
   "EVENT_NAME VARCHAR(128) not null,"
   "SOURCE VARCHAR(64),"
   "TIMER_START BIGINT unsigned,"
@@ -280,6 +282,7 @@ DROP PREPARE stmt;
 SET @cmd="CREATE TABLE performance_schema.events_waits_history_long("
   "THREAD_ID INTEGER not null,"
   "EVENT_ID BIGINT unsigned not null,"
+  "END_EVENT_ID BIGINT unsigned,"
   "EVENT_NAME VARCHAR(128) not null,"
   "SOURCE VARCHAR(64),"
   "TIMER_START BIGINT unsigned,"
@@ -918,6 +921,7 @@ DROP PREPARE stmt;
 SET @cmd="CREATE TABLE performance_schema.events_stages_current("
   "THREAD_ID INTEGER not null,"
   "EVENT_ID BIGINT unsigned not null,"
+  "END_EVENT_ID BIGINT unsigned,"
   "EVENT_NAME VARCHAR(128) not null,"
   "SOURCE VARCHAR(64),"
   "TIMER_START BIGINT unsigned,"
@@ -939,6 +943,7 @@ DROP PREPARE stmt;
 SET @cmd="CREATE TABLE performance_schema.events_stages_history("
   "THREAD_ID INTEGER not null,"
   "EVENT_ID BIGINT unsigned not null,"
+  "END_EVENT_ID BIGINT unsigned,"
   "EVENT_NAME VARCHAR(128) not null,"
   "SOURCE VARCHAR(64),"
   "TIMER_START BIGINT unsigned,"
@@ -960,6 +965,7 @@ DROP PREPARE stmt;
 SET @cmd="CREATE TABLE performance_schema.events_stages_history_long("
   "THREAD_ID INTEGER not null,"
   "EVENT_ID BIGINT unsigned not null,"
+  "END_EVENT_ID BIGINT unsigned,"
   "EVENT_NAME VARCHAR(128) not null,"
   "SOURCE VARCHAR(64),"
   "TIMER_START BIGINT unsigned,"
@@ -1076,6 +1082,7 @@ DROP PREPARE stmt;
 SET @cmd="CREATE TABLE performance_schema.events_statements_current("
   "THREAD_ID INTEGER not null,"
   "EVENT_ID BIGINT unsigned not null,"
+  "END_EVENT_ID BIGINT unsigned,"
   "EVENT_NAME VARCHAR(128) not null,"
   "SOURCE VARCHAR(64),"
   "TIMER_START BIGINT unsigned,"
@@ -1125,6 +1132,7 @@ DROP PREPARE stmt;
 SET @cmd="CREATE TABLE performance_schema.events_statements_history("
   "THREAD_ID INTEGER not null,"
   "EVENT_ID BIGINT unsigned not null,"
+  "END_EVENT_ID BIGINT unsigned,"
   "EVENT_NAME VARCHAR(128) not null,"
   "SOURCE VARCHAR(64),"
   "TIMER_START BIGINT unsigned,"
@@ -1174,6 +1182,7 @@ DROP PREPARE stmt;
 SET @cmd="CREATE TABLE performance_schema.events_statements_history_long("
   "THREAD_ID INTEGER not null,"
   "EVENT_ID BIGINT unsigned not null,"
+  "END_EVENT_ID BIGINT unsigned,"
   "EVENT_NAME VARCHAR(128) not null,"
   "SOURCE VARCHAR(64),"
   "TIMER_START BIGINT unsigned,"

=== modified file 'storage/perfschema/pfs.cc'
--- a/storage/perfschema/pfs.cc	2011-08-25 07:53:21 +0000
+++ b/storage/perfschema/pfs.cc	2011-08-26 08:42:40 +0000
@@ -2092,6 +2092,7 @@ get_thread_mutex_locker_v1(PSI_mutex_loc
       wait->m_timer_end= 0;
       wait->m_object_instance_addr= pfs_mutex->m_identity;
       wait->m_event_id= pfs_thread->m_event_id++;
+      wait->m_end_event_id= 0;
       wait->m_operation= mutex_operation_map[(int) op];
       wait->m_wait_class= WAIT_CLASS_MUTEX;
 
@@ -2179,6 +2180,7 @@ get_thread_rwlock_locker_v1(PSI_rwlock_l
       wait->m_timer_end= 0;
       wait->m_object_instance_addr= pfs_rwlock->m_identity;
       wait->m_event_id= pfs_thread->m_event_id++;
+      wait->m_end_event_id= 0;
       wait->m_operation= rwlock_operation_map[static_cast<int> (op)];
       wait->m_wait_class= WAIT_CLASS_RWLOCK;
 
@@ -2283,6 +2285,7 @@ get_thread_cond_locker_v1(PSI_cond_locke
       wait->m_timer_end= 0;
       wait->m_object_instance_addr= pfs_cond->m_identity;
       wait->m_event_id= pfs_thread->m_event_id++;
+      wait->m_end_event_id= 0;
       wait->m_operation= cond_operation_map[static_cast<int> (op)];
       wait->m_wait_class= WAIT_CLASS_COND;
 
@@ -2412,6 +2415,7 @@ get_thread_table_io_locker_v1(PSI_table_
       wait->m_timer_end= 0;
       wait->m_object_instance_addr= pfs_table->m_identity;
       wait->m_event_id= pfs_thread->m_event_id++;
+      wait->m_end_event_id= 0;
       wait->m_operation= table_io_operation_map[static_cast<int> (op)];
       wait->m_flags= 0;
       wait->m_object_type= share->get_object_type();
@@ -2525,6 +2529,7 @@ get_thread_table_lock_locker_v1(PSI_tabl
       wait->m_timer_end= 0;
       wait->m_object_instance_addr= pfs_table->m_identity;
       wait->m_event_id= pfs_thread->m_event_id++;
+      wait->m_end_event_id= 0;
       wait->m_operation= table_lock_operation_map[lock_type];
       wait->m_flags= 0;
       wait->m_object_type= share->get_object_type();
@@ -2623,6 +2628,7 @@ get_thread_file_name_locker_v1(PSI_file_
     wait->m_weak_file= pfs_file;
     wait->m_weak_version= pfs_file->get_version();
     wait->m_event_id= pfs_thread->m_event_id++;
+    wait->m_end_event_id= 0;
     wait->m_operation= file_operation_map[static_cast<int> (op)];
     wait->m_wait_class= WAIT_CLASS_FILE;
 
@@ -2694,6 +2700,7 @@ get_thread_file_stream_locker_v1(PSI_fil
       wait->m_weak_file= pfs_file;
       wait->m_weak_version= pfs_file->get_version();
       wait->m_event_id= pfs_thread->m_event_id++;
+      wait->m_end_event_id= 0;
       wait->m_operation= file_operation_map[static_cast<int> (op)];
       wait->m_wait_class= WAIT_CLASS_FILE;
 
@@ -2794,6 +2801,7 @@ get_thread_file_descriptor_locker_v1(PSI
       wait->m_weak_file= pfs_file;
       wait->m_weak_version= pfs_file->get_version();
       wait->m_event_id= pfs_thread->m_event_id++;
+      wait->m_end_event_id= 0;
       wait->m_operation= file_operation_map[static_cast<int> (op)];
       wait->m_wait_class= WAIT_CLASS_FILE;
 
@@ -2888,6 +2896,7 @@ get_thread_socket_locker_v1(PSI_socket_l
       wait->m_weak_socket=  pfs_socket;
       wait->m_weak_version= pfs_socket->get_version();
       wait->m_event_id=     pfs_thread->m_event_id++;
+      wait->m_end_event_id= 0;
       wait->m_operation=    socket_operation_map[static_cast<int>(op)];
       wait->m_wait_class=   WAIT_CLASS_SOCKET;
 
@@ -3149,6 +3158,7 @@ start_idle_wait_v1(PSI_idle_locker_state
       wait->m_timer_start= timer_start;
       wait->m_timer_end= 0;
       wait->m_event_id= pfs_thread->m_event_id++;
+      wait->m_end_event_id= 0;
       wait->m_operation= OPERATION_TYPE_IDLE;
       wait->m_source_file= src_file;
       wait->m_source_line= src_line;
@@ -3214,6 +3224,7 @@ static void end_idle_wait_v1(PSI_idle_lo
       DBUG_ASSERT(wait != NULL);
 
       wait->m_timer_end= timer_end;
+      wait->m_event_id= thread->m_event_id;
       if (flag_events_waits_history)
         insert_events_waits_history(thread, wait);
       if (flag_events_waits_history_long)
@@ -3312,6 +3323,7 @@ static void end_mutex_wait_v1(PSI_mutex_
       DBUG_ASSERT(wait != NULL);
 
       wait->m_timer_end= timer_end;
+      wait->m_end_event_id= thread->m_event_id;
       if (flag_events_waits_history)
         insert_events_waits_history(thread, wait);
       if (flag_events_waits_history_long)
@@ -3416,6 +3428,7 @@ static void end_rwlock_rdwait_v1(PSI_rwl
       DBUG_ASSERT(wait != NULL);
 
       wait->m_timer_end= timer_end;
+      wait->m_end_event_id= thread->m_event_id;
       if (flag_events_waits_history)
         insert_events_waits_history(thread, wait);
       if (flag_events_waits_history_long)
@@ -3513,6 +3526,7 @@ static void end_rwlock_wrwait_v1(PSI_rwl
       DBUG_ASSERT(wait != NULL);
 
       wait->m_timer_end= timer_end;
+      wait->m_end_event_id= thread->m_event_id;
       if (flag_events_waits_history)
         insert_events_waits_history(thread, wait);
       if (flag_events_waits_history_long)
@@ -3603,6 +3617,7 @@ static void end_cond_wait_v1(PSI_cond_lo
       DBUG_ASSERT(wait != NULL);
 
       wait->m_timer_end= timer_end;
+      wait->m_end_event_id= thread->m_event_id;
       if (flag_events_waits_history)
         insert_events_waits_history(thread, wait);
       if (flag_events_waits_history_long)
@@ -3704,6 +3719,7 @@ static void end_table_io_wait_v1(PSI_tab
     DBUG_ASSERT(wait != NULL);
 
     wait->m_timer_end= timer_end;
+    wait->m_end_event_id= thread->m_event_id;
     if (flag_events_waits_history)
       insert_events_waits_history(thread, wait);
     if (flag_events_waits_history_long)
@@ -3781,6 +3797,7 @@ static void end_table_lock_wait_v1(PSI_t
     DBUG_ASSERT(wait != NULL);
 
     wait->m_timer_end= timer_end;
+    wait->m_end_event_id= thread->m_event_id;
     if (flag_events_waits_history)
       insert_events_waits_history(thread, wait);
     if (flag_events_waits_history_long)
@@ -3940,6 +3957,7 @@ static void end_file_wait_v1(PSI_file_lo
       DBUG_ASSERT(wait != NULL);
 
       wait->m_timer_end= timer_end;
+      wait->m_end_event_id= thread->m_event_id;
       wait->m_number_of_bytes= count;
       if (flag_events_waits_history)
         insert_events_waits_history(thread, wait);
@@ -4015,6 +4033,7 @@ static void start_stage_v1(PSI_stage_key
 
     if (flag_events_stages_current)
     {
+      pfs->m_end_event_id= pfs_thread->m_event_id;
       if (flag_events_stages_history)
         insert_events_stages_history(pfs_thread, pfs);
       if (flag_events_stages_history_long)
@@ -4056,6 +4075,7 @@ static void start_stage_v1(PSI_stage_key
     /* m_thread_internal_id is immutable and already set */
     DBUG_ASSERT(pfs->m_thread_internal_id == pfs_thread->m_thread_internal_id);
     pfs->m_event_id= pfs_thread->m_event_id++;
+    pfs->m_end_event_id= 0;
     pfs->m_source_file= src_file;
     pfs->m_source_line= src_line;
 
@@ -4106,6 +4126,7 @@ static void end_stage_v1()
 
     if (flag_events_stages_current)
     {
+      pfs->m_end_event_id= pfs_thread->m_event_id;
       if (flag_events_stages_history)
         insert_events_stages_history(pfs_thread, pfs);
       if (flag_events_stages_history_long)
@@ -4164,6 +4185,7 @@ get_thread_statement_locker_v1(PSI_state
       /* m_thread_internal_id is immutable and already set */
       DBUG_ASSERT(pfs->m_thread_internal_id == pfs_thread->m_thread_internal_id);
       pfs->m_event_id= event_id;
+      pfs->m_end_event_id= 0;
       pfs->m_class= klass;
       pfs->m_timer_start= 0;
       pfs->m_timer_end= 0;
@@ -4534,6 +4556,7 @@ static void end_statement_v1(PSI_stateme
       }
 
       pfs->m_timer_end= timer_end;
+      pfs->m_end_event_id= thread->m_event_id;
       if (flag_events_statements_history)
         insert_events_statements_history(thread, pfs);
       if (flag_events_statements_history_long)
@@ -4713,6 +4736,7 @@ static void end_socket_wait_v1(PSI_socke
     DBUG_ASSERT(wait != NULL);
 
     wait->m_timer_end= timer_end;
+    wait->m_end_event_id= thread->m_event_id;
     wait->m_number_of_bytes= bytes;
 
     if (flag_events_waits_history)

=== modified file 'storage/perfschema/pfs_events.h'
--- a/storage/perfschema/pfs_events.h	2011-06-30 15:50:45 +0000
+++ b/storage/perfschema/pfs_events.h	2011-08-26 08:42:40 +0000
@@ -32,6 +32,8 @@ struct PFS_events
   ulong m_thread_internal_id;
   /** EVENT_ID. */
   ulonglong m_event_id;
+  /** END_EVENT_ID. */
+  ulonglong m_end_event_id;
   /** (EVENT_TYPE) */
   enum_event_type m_event_type;
   /** NESTING_EVENT_ID. */

=== modified file 'storage/perfschema/pfs_instr.cc'
--- a/storage/perfschema/pfs_instr.cc	2011-08-25 07:53:21 +0000
+++ b/storage/perfschema/pfs_instr.cc	2011-08-26 08:42:40 +0000
@@ -860,6 +860,7 @@ PFS_thread* create_thread(PFS_thread_cla
           child_wait= & pfs->m_events_waits_stack[index];
           child_wait->m_thread_internal_id= pfs->m_thread_internal_id;
           child_wait->m_event_id= 0;
+          child_wait->m_end_event_id= 0;
           child_wait->m_event_type= EVENT_TYPE_STATEMENT;
           child_wait->m_wait_class= NO_WAIT_CLASS;
         }
@@ -867,6 +868,7 @@ PFS_thread* create_thread(PFS_thread_cla
         PFS_events_stages *child_stage= & pfs->m_stage_current;
         child_stage->m_thread_internal_id= pfs->m_thread_internal_id;
         child_stage->m_event_id= 0;
+        child_stage->m_end_event_id= 0;
         child_stage->m_event_type= EVENT_TYPE_STATEMENT;
         child_stage->m_class= NULL;
         child_stage->m_timer_start= 0;
@@ -880,6 +882,7 @@ PFS_thread* create_thread(PFS_thread_cla
           child_statement= & pfs->m_statement_stack[index];
           child_statement->m_thread_internal_id= pfs->m_thread_internal_id;
           child_statement->m_event_id= 0;
+          child_statement->m_end_event_id= 0;
           child_statement->m_event_type= EVENT_TYPE_STATEMENT;
           child_statement->m_class= NULL;
           child_statement->m_timer_start= 0;

=== modified file 'storage/perfschema/table_events_stages.cc'
--- a/storage/perfschema/table_events_stages.cc	2011-06-30 15:50:45 +0000
+++ b/storage/perfschema/table_events_stages.cc	2011-08-26 08:42:40 +0000
@@ -41,6 +41,11 @@ static const TABLE_FIELD_TYPE field_type
     { NULL, 0}
   },
   {
+    { C_STRING_WITH_LEN("END_EVENT_ID") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
     { C_STRING_WITH_LEN("EVENT_NAME") },
     { C_STRING_WITH_LEN("varchar(128)") },
     { NULL, 0}
@@ -79,7 +84,7 @@ static const TABLE_FIELD_TYPE field_type
 
 TABLE_FIELD_DEF
 table_events_stages_current::m_field_def=
-{9 , field_types };
+{10 , field_types };
 
 PFS_engine_table_share
 table_events_stages_current::m_share=
@@ -157,6 +162,7 @@ void table_events_stages_common::make_ro
 
   m_row.m_thread_internal_id= stage->m_thread_internal_id;
   m_row.m_event_id= stage->m_event_id;
+  m_row.m_end_event_id= stage->m_end_event_id;
   m_row.m_nesting_event_id= stage->m_nesting_event_id;
   m_row.m_nesting_event_type= stage->m_nesting_event_type;
 
@@ -207,37 +213,43 @@ int table_events_stages_common::read_row
       case 1: /* EVENT_ID */
         set_field_ulonglong(f, m_row.m_event_id);
         break;
-      case 2: /* EVENT_NAME */
+      case 2: /* END_EVENT_ID */
+        if (m_row.m_end_event_id > 0)
+          set_field_ulonglong(f, m_row.m_end_event_id - 1);
+        else
+          f->set_null();
+        break;
+      case 3: /* EVENT_NAME */
         set_field_varchar_utf8(f, m_row.m_name, m_row.m_name_length);
         break;
-      case 3: /* SOURCE */
+      case 4: /* SOURCE */
         set_field_varchar_utf8(f, m_row.m_source, m_row.m_source_length);
         break;
-      case 4: /* TIMER_START */
+      case 5: /* TIMER_START */
         if (m_row.m_timer_start != 0)
           set_field_ulonglong(f, m_row.m_timer_start);
         else
           f->set_null();
         break;
-      case 5: /* TIMER_END */
+      case 6: /* TIMER_END */
         if (m_row.m_timer_end != 0)
           set_field_ulonglong(f, m_row.m_timer_end);
         else
           f->set_null();
         break;
-      case 6: /* TIMER_WAIT */
+      case 7: /* TIMER_WAIT */
         if (m_row.m_timer_wait != 0)
           set_field_ulonglong(f, m_row.m_timer_wait);
         else
           f->set_null();
         break;
-      case 7: /* NESTING_EVENT_ID */
+      case 8: /* NESTING_EVENT_ID */
         if (m_row.m_nesting_event_id != 0)
           set_field_ulonglong(f, m_row.m_nesting_event_id);
         else
           f->set_null();
         break;
-      case 8: /* NESTING_EVENT_TYPE */
+      case 9: /* NESTING_EVENT_TYPE */
         if (m_row.m_nesting_event_id != 0)
           set_field_enum(f, m_row.m_nesting_event_type);
         else

=== modified file 'storage/perfschema/table_events_stages.h'
--- a/storage/perfschema/table_events_stages.h	2011-06-30 15:50:45 +0000
+++ b/storage/perfschema/table_events_stages.h	2011-08-26 08:42:40 +0000
@@ -39,6 +39,8 @@ struct row_events_stages
   ulong m_thread_internal_id;
   /** Column EVENT_ID. */
   ulonglong m_event_id;
+  /** Column END_EVENT_ID. */
+  ulonglong m_end_event_id;
   /** Column NESTING_EVENT_ID. */
   ulonglong m_nesting_event_id;
   /** Column NESTING_EVENT_TYPE. */

=== modified file 'storage/perfschema/table_events_statements.cc'
--- a/storage/perfschema/table_events_statements.cc	2011-06-30 15:50:45 +0000
+++ b/storage/perfschema/table_events_statements.cc	2011-08-26 08:42:40 +0000
@@ -43,6 +43,11 @@ static const TABLE_FIELD_TYPE field_type
     { NULL, 0}
   },
   {
+    { C_STRING_WITH_LEN("END_EVENT_ID") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
     { C_STRING_WITH_LEN("EVENT_NAME") },
     { C_STRING_WITH_LEN("varchar(128)") },
     { NULL, 0}
@@ -221,7 +226,7 @@ static const TABLE_FIELD_TYPE field_type
 
 TABLE_FIELD_DEF
 table_events_statements_current::m_field_def=
-{37 , field_types };
+{38 , field_types };
 
 PFS_engine_table_share
 table_events_statements_current::m_share=
@@ -299,6 +304,7 @@ void table_events_statements_common::mak
 
   m_row.m_thread_internal_id= statement->m_thread_internal_id;
   m_row.m_event_id= statement->m_event_id;
+  m_row.m_end_event_id= statement->m_end_event_id;
   m_row.m_nesting_event_id= statement->m_nesting_event_id;
   m_row.m_nesting_event_type= statement->m_nesting_event_type;
 
@@ -383,137 +389,143 @@ int table_events_statements_common::read
       case 1: /* EVENT_ID */
         set_field_ulonglong(f, m_row.m_event_id);
         break;
-      case 2: /* EVENT_NAME */
+      case 2: /* END_EVENT_ID */
+        if (m_row.m_end_event_id > 0)
+          set_field_ulonglong(f, m_row.m_end_event_id - 1);
+        else
+          f->set_null();
+        break;
+      case 3: /* EVENT_NAME */
         set_field_varchar_utf8(f, m_row.m_name, m_row.m_name_length);
         break;
-      case 3: /* SOURCE */
+      case 4: /* SOURCE */
         set_field_varchar_utf8(f, m_row.m_source, m_row.m_source_length);
         break;
-      case 4: /* TIMER_START */
+      case 5: /* TIMER_START */
         if (m_row.m_timer_start != 0)
           set_field_ulonglong(f, m_row.m_timer_start);
         else
           f->set_null();
         break;
-      case 5: /* TIMER_END */
+      case 6: /* TIMER_END */
         if (m_row.m_timer_end != 0)
           set_field_ulonglong(f, m_row.m_timer_end);
         else
           f->set_null();
         break;
-      case 6: /* TIMER_WAIT */
+      case 7: /* TIMER_WAIT */
         if (m_row.m_timer_wait != 0)
           set_field_ulonglong(f, m_row.m_timer_wait);
         else
           f->set_null();
         break;
-      case 7: /* LOCK_TIME */
+      case 8: /* LOCK_TIME */
         if (m_row.m_lock_time != 0)
           set_field_ulonglong(f, m_row.m_lock_time);
         else
           f->set_null();
         break;
-      case 8: /* SQL_TEXT */
+      case 9: /* SQL_TEXT */
         if (m_row.m_sqltext_length)
           set_field_longtext_utf8(f, m_row.m_sqltext, m_row.m_sqltext_length);
         else
           f->set_null();
         break;
-      case 9: /* CURRENT_SCHEMA */
+      case 10: /* CURRENT_SCHEMA */
         if (m_row.m_current_schema_name_length)
           set_field_varchar_utf8(f, m_row.m_current_schema_name, m_row.m_current_schema_name_length);
         else
           f->set_null();
         break;
-      case 10: /* OBJECT_TYPE */
+      case 11: /* OBJECT_TYPE */
         f->set_null();
         break;
-      case 11: /* OBJECT_SCHEMA */
+      case 12: /* OBJECT_SCHEMA */
         f->set_null();
         break;
-      case 12: /* OBJECT_NAME */
+      case 13: /* OBJECT_NAME */
         f->set_null();
         break;
-      case 13: /* OBJECT_INSTANCE_BEGIN */
+      case 14: /* OBJECT_INSTANCE_BEGIN */
         f->set_null();
         break;
-      case 14: /* MYSQL_ERRNO */
+      case 15: /* MYSQL_ERRNO */
         set_field_ulong(f, m_row.m_sql_errno);
         break;
-      case 15: /* RETURNED_SQLSTATE */
+      case 16: /* RETURNED_SQLSTATE */
         if (m_row.m_sqlstate[0] != 0)
           set_field_varchar_utf8(f, m_row.m_sqlstate, SQLSTATE_LENGTH);
         else
           f->set_null();
         break;
-      case 16: /* MESSAGE_TEXT */
+      case 17: /* MESSAGE_TEXT */
         len= strlen(m_row.m_message_text);
         if (len)
           set_field_varchar_utf8(f, m_row.m_message_text, len);
         else
           f->set_null();
         break;
-      case 17: /* ERRORS */
+      case 18: /* ERRORS */
         set_field_ulonglong(f, m_row.m_error_count);
         break;
-      case 18: /* WARNINGS */
+      case 19: /* WARNINGS */
         set_field_ulonglong(f, m_row.m_warning_count);
         break;
-      case 19: /* ROWS_AFFECTED */
+      case 20: /* ROWS_AFFECTED */
         set_field_ulonglong(f, m_row.m_rows_affected);
         break;
-      case 20: /* ROWS_SENT */
+      case 21: /* ROWS_SENT */
         set_field_ulonglong(f, m_row.m_rows_sent);
         break;
-      case 21: /* ROWS_EXAMINED */
+      case 22: /* ROWS_EXAMINED */
         set_field_ulonglong(f, m_row.m_rows_examined);
         break;
-      case 22: /* CREATED_TMP_DISK_TABLES */
+      case 23: /* CREATED_TMP_DISK_TABLES */
         set_field_ulonglong(f, m_row.m_created_tmp_disk_tables);
         break;
-      case 23: /* CREATED_TMP_TABLES */
+      case 24: /* CREATED_TMP_TABLES */
         set_field_ulonglong(f, m_row.m_created_tmp_tables);
         break;
-      case 24: /* SELECT_FULL_JOIN */
+      case 25: /* SELECT_FULL_JOIN */
         set_field_ulonglong(f, m_row.m_select_full_join);
         break;
-      case 25: /* SELECT_FULL_RANGE_JOIN */
+      case 26: /* SELECT_FULL_RANGE_JOIN */
         set_field_ulonglong(f, m_row.m_select_full_range_join);
         break;
-      case 26: /* SELECT_RANGE */
+      case 27: /* SELECT_RANGE */
         set_field_ulonglong(f, m_row.m_select_range);
         break;
-      case 27: /* SELECT_RANGE_CHECK */
+      case 28: /* SELECT_RANGE_CHECK */
         set_field_ulonglong(f, m_row.m_select_range_check);
         break;
-      case 28: /* SELECT_SCAN */
+      case 29: /* SELECT_SCAN */
         set_field_ulonglong(f, m_row.m_select_scan);
         break;
-      case 29: /* SORT_MERGE_PASSES */
+      case 30: /* SORT_MERGE_PASSES */
         set_field_ulonglong(f, m_row.m_sort_merge_passes);
         break;
-      case 30: /* SORT_RANGE */
+      case 31: /* SORT_RANGE */
         set_field_ulonglong(f, m_row.m_sort_range);
         break;
-      case 31: /* SORT_ROWS */
+      case 32: /* SORT_ROWS */
         set_field_ulonglong(f, m_row.m_sort_rows);
         break;
-      case 32: /* SORT_SCAN */
+      case 33: /* SORT_SCAN */
         set_field_ulonglong(f, m_row.m_sort_scan);
         break;
-      case 33: /* NO_INDEX_USED */
+      case 34: /* NO_INDEX_USED */
         set_field_ulonglong(f, m_row.m_no_index_used);
         break;
-      case 34: /* NO_GOOD_INDEX_USED */
+      case 35: /* NO_GOOD_INDEX_USED */
         set_field_ulonglong(f, m_row.m_no_good_index_used);
         break;
-      case 35: /* NESTING_EVENT_ID */
+      case 36: /* NESTING_EVENT_ID */
         if (m_row.m_nesting_event_id != 0)
           set_field_ulonglong(f, m_row.m_nesting_event_id);
         else
           f->set_null();
         break;
-      case 36: /* NESTING_EVENT_TYPE */
+      case 37: /* NESTING_EVENT_TYPE */
         if (m_row.m_nesting_event_id != 0)
           set_field_enum(f, m_row.m_nesting_event_type);
         else

=== modified file 'storage/perfschema/table_events_statements.h'
--- a/storage/perfschema/table_events_statements.h	2011-06-30 15:50:45 +0000
+++ b/storage/perfschema/table_events_statements.h	2011-08-26 08:42:40 +0000
@@ -39,6 +39,8 @@ struct row_events_statements
   ulong m_thread_internal_id;
   /** Column EVENT_ID. */
   ulonglong m_event_id;
+  /** Column END_EVENT_ID. */
+  ulonglong m_end_event_id;
   /** Column NESTING_EVENT_ID. */
   ulonglong m_nesting_event_id;
   /** Column NESTING_EVENT_TYPE. */

=== modified file 'storage/perfschema/table_events_waits.cc'
--- a/storage/perfschema/table_events_waits.cc	2011-08-09 19:26:45 +0000
+++ b/storage/perfschema/table_events_waits.cc	2011-08-26 08:42:40 +0000
@@ -43,6 +43,11 @@ static const TABLE_FIELD_TYPE field_type
     { NULL, 0}
   },
   {
+    { C_STRING_WITH_LEN("END_EVENT_ID") },
+    { C_STRING_WITH_LEN("bigint(20)") },
+    { NULL, 0}
+  },
+  {
     { C_STRING_WITH_LEN("EVENT_NAME") },
     { C_STRING_WITH_LEN("varchar(128)") },
     { NULL, 0}
@@ -126,7 +131,7 @@ static const TABLE_FIELD_TYPE field_type
 
 TABLE_FIELD_DEF
 table_events_waits_current::m_field_def=
-{ 18, field_types };
+{ 19, field_types };
 
 PFS_engine_table_share
 table_events_waits_current::m_share=
@@ -433,6 +438,7 @@ void table_events_waits_common::make_row
 
   m_row.m_thread_internal_id= safe_thread->m_thread_internal_id;
   m_row.m_event_id= wait->m_event_id;
+  m_row.m_end_event_id= wait->m_end_event_id;
   m_row.m_nesting_event_id= wait->m_nesting_event_id;
   m_row.m_nesting_event_type= wait->m_nesting_event_type;
 
@@ -601,34 +607,40 @@ int table_events_waits_common::read_row_
       case 1: /* EVENT_ID */
         set_field_ulonglong(f, m_row.m_event_id);
         break;
-      case 2: /* EVENT_NAME */
+      case 2: /* END_EVENT_ID */
+        if (m_row.m_end_event_id > 0)
+          set_field_ulonglong(f, m_row.m_end_event_id - 1);
+        else
+          f->set_null();
+        break;
+      case 3: /* EVENT_NAME */
         set_field_varchar_utf8(f, m_row.m_name, m_row.m_name_length);
         break;
-      case 3: /* SOURCE */
+      case 4: /* SOURCE */
         set_field_varchar_utf8(f, m_row.m_source, m_row.m_source_length);
         break;
-      case 4: /* TIMER_START */
+      case 5: /* TIMER_START */
         if (m_row.m_timer_start != 0)
           set_field_ulonglong(f, m_row.m_timer_start);
         else
           f->set_null();
         break;
-      case 5: /* TIMER_END */
+      case 6: /* TIMER_END */
         if (m_row.m_timer_end != 0)
           set_field_ulonglong(f, m_row.m_timer_end);
         else
           f->set_null();
         break;
-      case 6: /* TIMER_WAIT */
+      case 7: /* TIMER_WAIT */
         if (m_row.m_timer_wait != 0)
           set_field_ulonglong(f, m_row.m_timer_wait);
         else
           f->set_null();
         break;
-      case 7: /* SPINS */
+      case 8: /* SPINS */
         f->set_null();
         break;
-      case 8: /* OBJECT_SCHEMA */
+      case 9: /* OBJECT_SCHEMA */
         if (m_row.m_object_schema_length > 0)
         {
           set_field_varchar_utf8(f, m_row.m_object_schema,
@@ -637,7 +649,7 @@ int table_events_waits_common::read_row_
         else
           f->set_null();
         break;
-      case 9: /* OBJECT_NAME */
+      case 10: /* OBJECT_NAME */
         if (m_row.m_object_name_length > 0)
         {
           set_field_varchar_utf8(f, m_row.m_object_name,
@@ -646,7 +658,7 @@ int table_events_waits_common::read_row_
         else
           f->set_null();
         break;
-      case 10: /* INDEX_NAME */
+      case 11: /* INDEX_NAME */
         if (m_row.m_index_name_length > 0)
         {
           set_field_varchar_utf8(f, m_row.m_index_name,
@@ -655,7 +667,7 @@ int table_events_waits_common::read_row_
         else
           f->set_null();
         break;
-      case 11: /* OBJECT_TYPE */
+      case 12: /* OBJECT_TYPE */
         if (m_row.m_object_type)
         {
           set_field_varchar_utf8(f, m_row.m_object_type,
@@ -664,26 +676,26 @@ int table_events_waits_common::read_row_
         else
           f->set_null();
         break;
-      case 12: /* OBJECT_INSTANCE */
+      case 13: /* OBJECT_INSTANCE */
         set_field_ulonglong(f, m_row.m_object_instance_addr);
         break;
-      case 13: /* NESTING_EVENT_ID */
+      case 14: /* NESTING_EVENT_ID */
         if (m_row.m_nesting_event_id != 0)
           set_field_ulonglong(f, m_row.m_nesting_event_id);
         else
           f->set_null();
         break;
-      case 14: /* NESTING_EVENT_TYPE */
+      case 15: /* NESTING_EVENT_TYPE */
         if (m_row.m_nesting_event_id != 0)
           set_field_enum(f, m_row.m_nesting_event_type);
         else
           f->set_null();
         break;
-      case 15: /* OPERATION */
+      case 16: /* OPERATION */
         operation= &operation_names_map[(int) m_row.m_operation - 1];
         set_field_varchar_utf8(f, operation->str, operation->length);
         break;
-      case 16: /* NUMBER_OF_BYTES */
+      case 17: /* NUMBER_OF_BYTES */
         if ((m_row.m_operation == OPERATION_TYPE_FILEREAD) ||
             (m_row.m_operation == OPERATION_TYPE_FILEWRITE) ||
             (m_row.m_operation == OPERATION_TYPE_FILECHSIZE) ||
@@ -695,7 +707,7 @@ int table_events_waits_common::read_row_
         else
           f->set_null();
         break;
-      case 17: /* FLAGS */
+      case 18: /* FLAGS */
         f->set_null();
         break;
       default:

=== modified file 'storage/perfschema/table_events_waits.h'
--- a/storage/perfschema/table_events_waits.h	2011-07-08 21:31:33 +0000
+++ b/storage/perfschema/table_events_waits.h	2011-08-26 08:42:40 +0000
@@ -39,6 +39,8 @@ struct row_events_waits
   ulong m_thread_internal_id;
   /** Column EVENT_ID. */
   ulonglong m_event_id;
+  /** Column END_EVENT_ID. */
+  ulonglong m_end_event_id;
   /** Column NESTING_EVENT_ID. */
   ulonglong m_nesting_event_id;
   /** Column NESTING_EVENT_TYPE. */

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-trunk-wl5863 branch (marc.alff:3407 to 3408) WL#5863Marc Alff26 Aug