database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

10.0-base merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-01-31 09:48:19 +01:00
parent 055b62f404 5267af5e9e
commit ab83952f29
531 changed files with 47557 additions and 6579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/perfschema/include/upgrade_check.inc
View File

@ -8,6 +8,8 @@
--source include/wait_until_count_sessions.inc
# Verify that mysql_upgrade complained about the performance_schema
--replace_regex /at line [0-9]+/at line ###/
--cat_file $err_file
--error 0,1
--remove_file $out_file

2
mysql-test/suite/perfschema/r/digest_table_full.result
View File

@ -76,7 +76,7 @@ SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS
NULL NULL 29 21 1 2
b94bc8f50c92e01784d3148b3d2086c8 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0
169378b8f621f69e494b409cac921a8a TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0
SHOW VARIABLES LIKE "performance_schema_digests_size";
Variable_name Value
performance_schema_digests_size 2

25
mysql-test/suite/perfschema/r/func_file_io.result
View File

@ -3,6 +3,7 @@ UPDATE performance_schema.setup_instruments SET enabled = 'YES'
WHERE name LIKE 'wait/io/file/%';
update performance_schema.threads SET instrumented = 'YES'
WHERE PROCESSLIST_ID=connection_id();
flush status;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value')
ENGINE=MyISAM;
@ -128,3 +129,27 @@ GROUP BY p.processlist_user, h.operation
HAVING BYTES > 0
ORDER BY p.processlist_user, h.operation;
UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
show status like "performance_schema%";
Variable_name Value
Performance_schema_accounts_lost 0
Performance_schema_cond_classes_lost 0
Performance_schema_cond_instances_lost 0
Performance_schema_digest_lost 0
Performance_schema_file_classes_lost 0
Performance_schema_file_handles_lost 0
Performance_schema_file_instances_lost 0
Performance_schema_hosts_lost 0
Performance_schema_locker_lost 0
Performance_schema_mutex_classes_lost 0
Performance_schema_mutex_instances_lost 0
Performance_schema_rwlock_classes_lost 0
Performance_schema_rwlock_instances_lost 0
Performance_schema_socket_classes_lost 0
Performance_schema_socket_instances_lost 0
Performance_schema_stage_classes_lost 0
Performance_schema_statement_classes_lost 0
Performance_schema_table_handles_lost 0
Performance_schema_table_instances_lost 0
Performance_schema_thread_classes_lost 0
Performance_schema_thread_instances_lost 0
Performance_schema_users_lost 0

33
mysql-test/suite/perfschema/r/func_mutex.result
View File

@ -2,6 +2,15 @@ UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
UPDATE performance_schema.setup_instruments SET enabled = 'YES'
WHERE name LIKE 'wait/synch/mutex/%'
OR name LIKE 'wait/synch/rwlock/%';
flush status;
select NAME from performance_schema.mutex_instances
where NAME = 'wait/synch/mutex/sql/LOCK_open';
NAME
wait/synch/mutex/sql/LOCK_open
select NAME from performance_schema.rwlock_instances
where NAME = 'wait/synch/rwlock/sql/LOCK_grant';
NAME
wait/synch/rwlock/sql/LOCK_grant
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value')
ENGINE=MyISAM;
@ -113,3 +122,27 @@ Success
UPDATE performance_schema.setup_instruments SET enabled = 'YES';
DROP TABLE t1;
UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
show status like "performance_schema%";
Variable_name Value
Performance_schema_accounts_lost 0
Performance_schema_cond_classes_lost 0
Performance_schema_cond_instances_lost 0
Performance_schema_digest_lost 0
Performance_schema_file_classes_lost 0
Performance_schema_file_handles_lost 0
Performance_schema_file_instances_lost 0
Performance_schema_hosts_lost 0
Performance_schema_locker_lost 0
Performance_schema_mutex_classes_lost 0
Performance_schema_mutex_instances_lost 0
Performance_schema_rwlock_classes_lost 0
Performance_schema_rwlock_instances_lost 0
Performance_schema_socket_classes_lost 0
Performance_schema_socket_instances_lost 0
Performance_schema_stage_classes_lost 0
Performance_schema_statement_classes_lost 0
Performance_schema_table_handles_lost 0
Performance_schema_table_instances_lost 0
Performance_schema_thread_classes_lost 0
Performance_schema_thread_instances_lost 0
Performance_schema_users_lost 0

495
mysql-test/suite/perfschema/r/pfs_upgrade.result
View File

@ -8,56 +8,55 @@ use performance_schema;
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 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 288: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 319: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 332: Table 'socket_instances' already exists
ERROR 1050 (42S01) at line 362: Table 'socket_summary_by_instance' already exists
ERROR 1050 (42S01) at line 391: Table 'socket_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 432: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 446: Table 'objects_summary_global_by_type' already exists
ERROR 1050 (42S01) at line 456: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 466: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 475: Table 'setup_actors' already exists
ERROR 1050 (42S01) at line 483: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 492: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 503: Table 'setup_objects' already exists
ERROR 1050 (42S01) at line 511: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 556: Table 'table_io_waits_summary_by_index_usage' already exists
ERROR 1050 (42S01) at line 600: Table 'table_io_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line 679: Table 'table_lock_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line 699: Table 'threads' already exists
ERROR 1050 (42S01) at line 715: Table 'events_stages_current' already exists
ERROR 1050 (42S01) at line 731: Table 'events_stages_history' already exists
ERROR 1050 (42S01) at line 747: Table 'events_stages_history_long' already exists
ERROR 1050 (42S01) at line 760: Table 'events_stages_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 773: Table 'events_stages_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line 786: Table 'events_stages_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line 800: Table 'events_stages_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line 812: Table 'events_stages_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 858: Table 'events_statements_current' already exists
ERROR 1050 (42S01) at line 904: Table 'events_statements_history' already exists
ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
ERROR 1050 (42S01) at line 1128: Table 'users' already exists
ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists
ERROR 1644 (HY000) at line 1594: Unexpected content found in the performance_schema database.
ERROR 1050 (42S01) at line ###: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'file_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line ###: Table 'socket_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_instance' already exists
ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'objects_summary_global_by_type' already exists
ERROR 1050 (42S01) at line ###: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line ###: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_actors' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_objects' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_index_usage' already exists
ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line ###: Table 'table_lock_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line ###: Table 'threads' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_current' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_history' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_history_long' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_current' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_history' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_history_long' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'hosts' already exists
ERROR 1050 (42S01) at line ###: Table 'users' already exists
ERROR 1050 (42S01) at line ###: Table 'accounts' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_digest' already exists
FATAL ERROR: Upgrade failed
show tables like "user_table";
Tables_in_performance_schema (user_table)
@ -70,56 +69,55 @@ use performance_schema;
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 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 288: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 319: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 332: Table 'socket_instances' already exists
ERROR 1050 (42S01) at line 362: Table 'socket_summary_by_instance' already exists
ERROR 1050 (42S01) at line 391: Table 'socket_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 432: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 446: Table 'objects_summary_global_by_type' already exists
ERROR 1050 (42S01) at line 456: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 466: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 475: Table 'setup_actors' already exists
ERROR 1050 (42S01) at line 483: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 492: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 503: Table 'setup_objects' already exists
ERROR 1050 (42S01) at line 511: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 556: Table 'table_io_waits_summary_by_index_usage' already exists
ERROR 1050 (42S01) at line 600: Table 'table_io_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line 679: Table 'table_lock_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line 699: Table 'threads' already exists
ERROR 1050 (42S01) at line 715: Table 'events_stages_current' already exists
ERROR 1050 (42S01) at line 731: Table 'events_stages_history' already exists
ERROR 1050 (42S01) at line 747: Table 'events_stages_history_long' already exists
ERROR 1050 (42S01) at line 760: Table 'events_stages_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 773: Table 'events_stages_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line 786: Table 'events_stages_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line 800: Table 'events_stages_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line 812: Table 'events_stages_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 858: Table 'events_statements_current' already exists
ERROR 1050 (42S01) at line 904: Table 'events_statements_history' already exists
ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
ERROR 1050 (42S01) at line 1128: Table 'users' already exists
ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists
ERROR 1644 (HY000) at line 1594: Unexpected content found in the performance_schema database.
ERROR 1050 (42S01) at line ###: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'file_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line ###: Table 'socket_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_instance' already exists
ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'objects_summary_global_by_type' already exists
ERROR 1050 (42S01) at line ###: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line ###: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_actors' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_objects' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_index_usage' already exists
ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line ###: Table 'table_lock_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line ###: Table 'threads' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_current' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_history' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_history_long' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_current' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_history' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_history_long' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'hosts' already exists
ERROR 1050 (42S01) at line ###: Table 'users' already exists
ERROR 1050 (42S01) at line ###: Table 'accounts' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_digest' already exists
FATAL ERROR: Upgrade failed
show tables like "user_view";
Tables_in_performance_schema (user_view)
@ -130,56 +128,55 @@ drop view test.user_view;
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 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 288: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 319: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 332: Table 'socket_instances' already exists
ERROR 1050 (42S01) at line 362: Table 'socket_summary_by_instance' already exists
ERROR 1050 (42S01) at line 391: Table 'socket_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 432: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 446: Table 'objects_summary_global_by_type' already exists
ERROR 1050 (42S01) at line 456: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 466: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 475: Table 'setup_actors' already exists
ERROR 1050 (42S01) at line 483: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 492: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 503: Table 'setup_objects' already exists
ERROR 1050 (42S01) at line 511: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 556: Table 'table_io_waits_summary_by_index_usage' already exists
ERROR 1050 (42S01) at line 600: Table 'table_io_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line 679: Table 'table_lock_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line 699: Table 'threads' already exists
ERROR 1050 (42S01) at line 715: Table 'events_stages_current' already exists
ERROR 1050 (42S01) at line 731: Table 'events_stages_history' already exists
ERROR 1050 (42S01) at line 747: Table 'events_stages_history_long' already exists
ERROR 1050 (42S01) at line 760: Table 'events_stages_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 773: Table 'events_stages_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line 786: Table 'events_stages_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line 800: Table 'events_stages_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line 812: Table 'events_stages_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 858: Table 'events_statements_current' already exists
ERROR 1050 (42S01) at line 904: Table 'events_statements_history' already exists
ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
ERROR 1050 (42S01) at line 1128: Table 'users' already exists
ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists
ERROR 1644 (HY000) at line 1594: Unexpected content found in the performance_schema database.
ERROR 1050 (42S01) at line ###: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'file_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line ###: Table 'socket_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_instance' already exists
ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'objects_summary_global_by_type' already exists
ERROR 1050 (42S01) at line ###: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line ###: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_actors' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_objects' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_index_usage' already exists
ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line ###: Table 'table_lock_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line ###: Table 'threads' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_current' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_history' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_history_long' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_current' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_history' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_history_long' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'hosts' already exists
ERROR 1050 (42S01) at line ###: Table 'users' already exists
ERROR 1050 (42S01) at line ###: Table 'accounts' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_digest' already exists
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@ -190,56 +187,55 @@ drop procedure test.user_proc;
create function test.user_func() returns integer
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 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 288: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 319: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 332: Table 'socket_instances' already exists
ERROR 1050 (42S01) at line 362: Table 'socket_summary_by_instance' already exists
ERROR 1050 (42S01) at line 391: Table 'socket_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 432: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 446: Table 'objects_summary_global_by_type' already exists
ERROR 1050 (42S01) at line 456: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 466: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 475: Table 'setup_actors' already exists
ERROR 1050 (42S01) at line 483: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 492: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 503: Table 'setup_objects' already exists
ERROR 1050 (42S01) at line 511: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 556: Table 'table_io_waits_summary_by_index_usage' already exists
ERROR 1050 (42S01) at line 600: Table 'table_io_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line 679: Table 'table_lock_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line 699: Table 'threads' already exists
ERROR 1050 (42S01) at line 715: Table 'events_stages_current' already exists
ERROR 1050 (42S01) at line 731: Table 'events_stages_history' already exists
ERROR 1050 (42S01) at line 747: Table 'events_stages_history_long' already exists
ERROR 1050 (42S01) at line 760: Table 'events_stages_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 773: Table 'events_stages_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line 786: Table 'events_stages_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line 800: Table 'events_stages_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line 812: Table 'events_stages_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 858: Table 'events_statements_current' already exists
ERROR 1050 (42S01) at line 904: Table 'events_statements_history' already exists
ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
ERROR 1050 (42S01) at line 1128: Table 'users' already exists
ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists
ERROR 1644 (HY000) at line 1594: Unexpected content found in the performance_schema database.
ERROR 1050 (42S01) at line ###: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'file_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line ###: Table 'socket_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_instance' already exists
ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'objects_summary_global_by_type' already exists
ERROR 1050 (42S01) at line ###: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line ###: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_actors' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_objects' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_index_usage' already exists
ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line ###: Table 'table_lock_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line ###: Table 'threads' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_current' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_history' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_history_long' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_current' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_history' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_history_long' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'hosts' already exists
ERROR 1050 (42S01) at line ###: Table 'users' already exists
ERROR 1050 (42S01) at line ###: Table 'accounts' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_digest' already exists
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@ -250,56 +246,55 @@ drop function test.user_func;
create event test.user_event on schedule every 1 day do
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 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 288: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 319: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 332: Table 'socket_instances' already exists
ERROR 1050 (42S01) at line 362: Table 'socket_summary_by_instance' already exists
ERROR 1050 (42S01) at line 391: Table 'socket_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 432: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 446: Table 'objects_summary_global_by_type' already exists
ERROR 1050 (42S01) at line 456: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 466: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 475: Table 'setup_actors' already exists
ERROR 1050 (42S01) at line 483: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 492: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 503: Table 'setup_objects' already exists
ERROR 1050 (42S01) at line 511: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 556: Table 'table_io_waits_summary_by_index_usage' already exists
ERROR 1050 (42S01) at line 600: Table 'table_io_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line 679: Table 'table_lock_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line 699: Table 'threads' already exists
ERROR 1050 (42S01) at line 715: Table 'events_stages_current' already exists
ERROR 1050 (42S01) at line 731: Table 'events_stages_history' already exists
ERROR 1050 (42S01) at line 747: Table 'events_stages_history_long' already exists
ERROR 1050 (42S01) at line 760: Table 'events_stages_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 773: Table 'events_stages_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line 786: Table 'events_stages_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line 800: Table 'events_stages_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line 812: Table 'events_stages_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 858: Table 'events_statements_current' already exists
ERROR 1050 (42S01) at line 904: Table 'events_statements_history' already exists
ERROR 1050 (42S01) at line 950: Table 'events_statements_history_long' already exists
ERROR 1050 (42S01) at line 982: Table 'events_statements_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 1014: Table 'events_statements_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line 1046: Table 'events_statements_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line 1079: Table 'events_statements_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line 1110: Table 'events_statements_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 1119: Table 'hosts' already exists
ERROR 1050 (42S01) at line 1128: Table 'users' already exists
ERROR 1050 (42S01) at line 1138: Table 'accounts' already exists
ERROR 1050 (42S01) at line 1172: Table 'events_statements_summary_by_digest' already exists
ERROR 1644 (HY000) at line 1594: Unexpected content found in the performance_schema database.
ERROR 1050 (42S01) at line ###: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'file_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line ###: Table 'socket_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_instance' already exists
ERROR 1050 (42S01) at line ###: Table 'socket_summary_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'objects_summary_global_by_type' already exists
ERROR 1050 (42S01) at line ###: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line ###: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_actors' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_objects' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_index_usage' already exists
ERROR 1050 (42S01) at line ###: Table 'table_io_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line ###: Table 'table_lock_waits_summary_by_table' already exists
ERROR 1050 (42S01) at line ###: Table 'threads' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_current' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_history' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_history_long' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_stages_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_current' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_history' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_history_long' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_host_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_user_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_account_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line ###: Table 'hosts' already exists
ERROR 1050 (42S01) at line ###: Table 'users' already exists
ERROR 1050 (42S01) at line ###: Table 'accounts' already exists
ERROR 1050 (42S01) at line ###: Table 'events_statements_summary_by_digest' already exists
FATAL ERROR: Upgrade failed
select name from mysql.event where db='performance_schema';
name

44
mysql-test/suite/perfschema/r/statement_digest.result
View File

@ -75,28 +75,28 @@ Warning 1265 Data truncated for column 'c' at row 1
SELECT DIGEST, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS
b94bc8f50c92e01784d3148b3d2086c8 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0
ea6492426a33544a059bc12766c5ba3d SELECT ? FROM t1 1 0 0 0
692668ddf608983c586aef1c575ee9c6 SELECT ? FROM `t1` 1 0 0 0
f630f3ea22832be48798c5e51bb88189 SELECT ?, ... FROM t1 2 0 0 0
a98062477bd693dacfc0df96c68c5585 SELECT ? FROM t2 1 0 0 0
12cd65a2242b7643f9ad4418c389677a SELECT ?, ... FROM t2 2 0 0 0
32d8fa3c3ed3b6c26ac792495188f4a4 INSERT INTO t1 VALUES (?) 1 1 0 0
8bf0b320418673ba7d23f11f61bae318 INSERT INTO t2 VALUES (?) 1 1 0 0
a411b3681f67af51cddca60a3d5c260f INSERT INTO t3 VALUES (...) 1 1 0 0
23d0399fcd03fabcc9eeadb387121a44 INSERT INTO t4 VALUES (...) 1 1 0 0
c0ec9a3fd081147370256fb6b64e2f67 INSERT INTO t5 VALUES (...) 1 1 0 0
ba58da885d020e31d8c38b67e0f6da4c INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0
9c272a31286b15643b38fecc33599eea INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0
a7d009150c5da8b925776dea63ed77d7 INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0
b695dab1504c4e588a91af231b9c9e26 SELECT ? + ? 3 0 0 0
a2635fa56a271bdf473419620249f7ef SELECT ? 1 0 0 0
bce3f7384ae2ab78354b031184fde12d CREATE SCHEMA statements_digest_temp 2 2 0 0
2a0e36afeaac85dc117c3856388a4fae DROP SCHEMA statements_digest_temp 2 0 0 0
bb607bee73d602560af915aa4514eac4 SELECT ? FROM t11 1 0 0 1
4cd9bc5a9ed1ac12cd380187dab2921a CREATE TABLE t11 ( c CHARACTER (?) ) 2 0 0 1
bd53dcd5e36e77d74df5358baf658cee INSERT INTO t11 VALUES (?) 1 1 1 0
f62dd76b64fad47e6558f3d1b03ff215 SHOW WARNINGS 1 0 0 0
169378b8f621f69e494b409cac921a8a TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1 0 0 0
e4be9763aa1ac0b1240df516b56c87f7 SELECT ? FROM t1 1 0 0 0
4b427080de408a9901110476b8d89294 SELECT ? FROM `t1` 1 0 0 0
40f18ff66269a8b98e55adddd015b34e SELECT ?, ... FROM t1 2 0 0 0
e987e8bf850f505f6f77eb07a7bbe04a SELECT ? FROM t2 1 0 0 0
607f77cb3413947bd5dbd63f76612f8a SELECT ?, ... FROM t2 2 0 0 0
f42737acdd47cab2d221cd39090bbded INSERT INTO t1 VALUES (?) 1 1 0 0
7370fb00cd852c6997143c4d2fdbd195 INSERT INTO t2 VALUES (?) 1 1 0 0
d081782e520e5b728af90727126d4e29 INSERT INTO t3 VALUES (...) 1 1 0 0
523f7d6062fa7d22b4d52aff8d86822a INSERT INTO t4 VALUES (...) 1 1 0 0
b5ca6eebd080515a634701700781f06a INSERT INTO t5 VALUES (...) 1 1 0 0
89b024c9cb432b7d8a5bb8c2d669681b INSERT INTO t1 VALUES (?) /* , ... */ 2 7 0 0
77ecbf7f22a1336af595d5d5a3289e3b INSERT INTO t3 VALUES (...) /* , ... */ 1 3 0 0
239f41ec764182041ee7fdd8d949cc5c INSERT INTO t5 VALUES (...) /* , ... */ 1 3 0 0
e0d2d03f8bb2fd3d349ddd73a950a9e9 SELECT ? + ? 3 0 0 0
c5bd0023064662b510b51696f1156a4b SELECT ? 1 0 0 0
4ffe9781212ce310328413c9177c433f CREATE SCHEMA statements_digest_temp 2 2 0 0
3080b4ad1ab930bea0de4df1a4e28545 DROP SCHEMA statements_digest_temp 2 0 0 0
6f670a13be2183ac28f11ff5264c24b5 SELECT ? FROM t11 1 0 0 1
7721a3a30656deccf166c8706c87aca5 CREATE TABLE t11 ( c CHARACTER (?) ) 2 0 0 1
e563777e3c11d2b111f1dd6ca27da9d7 INSERT INTO t11 VALUES (?) 1 1 1 0
f4a01378d55fccee18a4d359d3aa49c0 SHOW WARNINGS 1 0 0 0
####################################
# CLEANUP
####################################

44
mysql-test/suite/perfschema/r/statement_digest_consumers.result
View File

@ -88,28 +88,28 @@ Warning 1265 Data truncated for column 'c' at row 1
####################################
SELECT digest, digest_text, count_star FROM performance_schema.events_statements_summary_by_digest;
digest digest_text count_star
b94bc8f50c92e01784d3148b3d2086c8 TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1
ea6492426a33544a059bc12766c5ba3d SELECT ? FROM t1 1
692668ddf608983c586aef1c575ee9c6 SELECT ? FROM `t1` 1
f630f3ea22832be48798c5e51bb88189 SELECT ?, ... FROM t1 2
a98062477bd693dacfc0df96c68c5585 SELECT ? FROM t2 1
12cd65a2242b7643f9ad4418c389677a SELECT ?, ... FROM t2 2
32d8fa3c3ed3b6c26ac792495188f4a4 INSERT INTO t1 VALUES (?) 1
8bf0b320418673ba7d23f11f61bae318 INSERT INTO t2 VALUES (?) 1
a411b3681f67af51cddca60a3d5c260f INSERT INTO t3 VALUES (...) 1
23d0399fcd03fabcc9eeadb387121a44 INSERT INTO t4 VALUES (...) 1
c0ec9a3fd081147370256fb6b64e2f67 INSERT INTO t5 VALUES (...) 1
ba58da885d020e31d8c38b67e0f6da4c INSERT INTO t1 VALUES (?) /* , ... */ 2
9c272a31286b15643b38fecc33599eea INSERT INTO t3 VALUES (...) /* , ... */ 1
a7d009150c5da8b925776dea63ed77d7 INSERT INTO t5 VALUES (...) /* , ... */ 1
b695dab1504c4e588a91af231b9c9e26 SELECT ? + ? 3
a2635fa56a271bdf473419620249f7ef SELECT ? 1
bce3f7384ae2ab78354b031184fde12d CREATE SCHEMA statements_digest_temp 2
2a0e36afeaac85dc117c3856388a4fae DROP SCHEMA statements_digest_temp 2
bb607bee73d602560af915aa4514eac4 SELECT ? FROM t11 1
4cd9bc5a9ed1ac12cd380187dab2921a CREATE TABLE t11 ( c CHARACTER (?) ) 2
bd53dcd5e36e77d74df5358baf658cee INSERT INTO t11 VALUES (?) 1
f62dd76b64fad47e6558f3d1b03ff215 SHOW WARNINGS 1
169378b8f621f69e494b409cac921a8a TRUNCATE TABLE performance_schema . events_statements_summary_by_digest 1
e4be9763aa1ac0b1240df516b56c87f7 SELECT ? FROM t1 1
4b427080de408a9901110476b8d89294 SELECT ? FROM `t1` 1
40f18ff66269a8b98e55adddd015b34e SELECT ?, ... FROM t1 2
e987e8bf850f505f6f77eb07a7bbe04a SELECT ? FROM t2 1
607f77cb3413947bd5dbd63f76612f8a SELECT ?, ... FROM t2 2
f42737acdd47cab2d221cd39090bbded INSERT INTO t1 VALUES (?) 1
7370fb00cd852c6997143c4d2fdbd195 INSERT INTO t2 VALUES (?) 1
d081782e520e5b728af90727126d4e29 INSERT INTO t3 VALUES (...) 1
523f7d6062fa7d22b4d52aff8d86822a INSERT INTO t4 VALUES (...) 1
b5ca6eebd080515a634701700781f06a INSERT INTO t5 VALUES (...) 1
89b024c9cb432b7d8a5bb8c2d669681b INSERT INTO t1 VALUES (?) /* , ... */ 2
77ecbf7f22a1336af595d5d5a3289e3b INSERT INTO t3 VALUES (...) /* , ... */ 1
239f41ec764182041ee7fdd8d949cc5c INSERT INTO t5 VALUES (...) /* , ... */ 1
e0d2d03f8bb2fd3d349ddd73a950a9e9 SELECT ? + ? 3
c5bd0023064662b510b51696f1156a4b SELECT ? 1
4ffe9781212ce310328413c9177c433f CREATE SCHEMA statements_digest_temp 2
3080b4ad1ab930bea0de4df1a4e28545 DROP SCHEMA statements_digest_temp 2
6f670a13be2183ac28f11ff5264c24b5 SELECT ? FROM t11 1
7721a3a30656deccf166c8706c87aca5 CREATE TABLE t11 ( c CHARACTER (?) ) 2
e563777e3c11d2b111f1dd6ca27da9d7 INSERT INTO t11 VALUES (?) 1
f4a01378d55fccee18a4d359d3aa49c0 SHOW WARNINGS 1
SELECT digest, digest_text FROM performance_schema.events_statements_current;
digest digest_text
####################################

4
mysql-test/suite/perfschema/r/statement_digest_long_query.result
View File

@ -8,5 +8,5 @@ SELECT 1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1+1
####################################
SELECT digest, digest_text, count_star FROM events_statements_summary_by_digest;
digest digest_text count_star
551139187583b3dff117e28b5935406c TRUNCATE TABLE events_statements_summary_by_digest 1
6b577979631439bd015b7675abcd91fe SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ... 1
2b59f75dae5f99499a30ee9d7dad331c TRUNCATE TABLE events_statements_summary_by_digest 1
2aa8806683d087e099c1e389ccf1b5a8 SELECT ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ? + ... 1

7
mysql-test/suite/perfschema/t/func_file_io.test
View File

@ -15,6 +15,9 @@ WHERE name LIKE 'wait/io/file/%';
update performance_schema.threads SET instrumented = 'YES'
WHERE PROCESSLIST_ID=connection_id();
# reset lost counters
flush status;
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
@ -183,3 +186,7 @@ ORDER BY p.processlist_user, h.operation;
# Clean-up.
UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
# In case of failure, will indicate the root cause
show status like "performance_schema%";

12
mysql-test/suite/perfschema/t/func_mutex.test
View File

@ -13,6 +13,15 @@ UPDATE performance_schema.setup_instruments SET enabled = 'YES'
WHERE name LIKE 'wait/synch/mutex/%'
OR name LIKE 'wait/synch/rwlock/%';
# reset lost counters
flush status;
# Make sure objects are instrumented
select NAME from performance_schema.mutex_instances
where NAME = 'wait/synch/mutex/sql/LOCK_open';
select NAME from performance_schema.rwlock_instances
where NAME = 'wait/synch/rwlock/sql/LOCK_grant';
--disable_warnings
DROP TABLE IF EXISTS t1;
--enable_warnings
@ -119,3 +128,6 @@ DROP TABLE t1;
UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
# In case of failure, will indicate the root cause
show status like "performance_schema%";