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

MDEV-4262 - P_S discovery

Browse Source 
Discover P_S tables automatically.

Most of this patch is code clean-up:
- removed tests and code responsible for P_S tables correctness verification
- always return error from ha_perfschema::create()
- install/upgrade scripts won't create P_S tables anymore
This commit is contained in:
Sergey Vojtovich
2014-08-19 15:18:18 +04:00
parent e7669cf607
commit f1c1c04a34
107 changed files with 889 additions and 6317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,11 +3,10 @@
#
--source include/count_sessions.inc
--error 1
--exec $MYSQL_UPGRADE --skip-verbose --force > $out_file 2> $err_file
--source include/wait_until_count_sessions.inc
# Verify that mysql_upgrade complained about the performance_schema
# Verify that mysql_upgrade does not complain about the performance_schema
--replace_regex /at line [0-9]+/at line ###/
--cat_file $err_file

53
mysql-test/suite/perfschema/r/pfs_upgrade_event.result
View File

@ -3,59 +3,6 @@ drop event if exists test.user_event;
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 ###: 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 'host_cache' 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
ERROR 1050 (42S01) at line ###: Table 'session_connect_attrs' already exists
ERROR 1050 (42S01) at line ###: Table 'session_account_connect_attrs' already exists
FATAL ERROR: Upgrade failed
select name from mysql.event where db='performance_schema';
name
user_event

53
mysql-test/suite/perfschema/r/pfs_upgrade_func.result
View File

@ -3,59 +3,6 @@ drop function if exists test.user_func;
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 ###: 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 'host_cache' 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
ERROR 1050 (42S01) at line ###: Table 'session_connect_attrs' already exists
ERROR 1050 (42S01) at line ###: Table 'session_account_connect_attrs' already exists
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
user_func

53
mysql-test/suite/perfschema/r/pfs_upgrade_proc.result
View File

@ -3,59 +3,6 @@ drop procedure if exists test.user_proc;
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 ###: 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 'host_cache' 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
ERROR 1050 (42S01) at line ###: Table 'session_connect_attrs' already exists
ERROR 1050 (42S01) at line ###: Table 'session_account_connect_attrs' already exists
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
user_proc

53
mysql-test/suite/perfschema/r/pfs_upgrade_table.result
View File

@ -5,59 +5,6 @@ use performance_schema;
show tables like "user_table";
Tables_in_performance_schema (user_table)
user_table
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 'host_cache' 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
ERROR 1050 (42S01) at line ###: Table 'session_connect_attrs' already exists
ERROR 1050 (42S01) at line ###: Table 'session_account_connect_attrs' already exists
FATAL ERROR: Upgrade failed
show tables like "user_table";
Tables_in_performance_schema (user_table)
user_table

53
mysql-test/suite/perfschema/r/pfs_upgrade_view.result
View File

@ -5,59 +5,6 @@ use performance_schema;
show tables like "user_view";
Tables_in_performance_schema (user_view)
user_view
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 'host_cache' 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
ERROR 1050 (42S01) at line ###: Table 'session_connect_attrs' already exists
ERROR 1050 (42S01) at line ###: Table 'session_account_connect_attrs' already exists
FATAL ERROR: Upgrade failed
show tables like "user_view";
Tables_in_performance_schema (user_view)
user_view

6
mysql-test/suite/perfschema/r/tampered_perfschema_table1.result
View File

@ -1,6 +0,0 @@
call mtr.add_suppression(
"Column count of performance_schema.setup_instruments is wrong. "
"Expected 4, found 3. The table is probably corrupted");
select * from performance_schema.setup_instruments limit 1;
ERROR HY000: Native table 'performance_schema'.'setup_instruments' has the wrong structure
select * from performance_schema.setup_consumers limit 1;

1
mysql-test/suite/perfschema/t/tampered_perfschema_table1-master.opt
View File

@ -1 +0,0 @@
--loose-debug=+d,tampered_perfschema_table1

25
mysql-test/suite/perfschema/t/tampered_perfschema_table1.test
View File

@ -1,25 +0,0 @@
# Tests for PERFORMANCE_SCHEMA
# This test uses error injection,
# see PFS_engine_table_share::check_all_tables()
# Verify that the server starts even when a performance schema table
# is corrupted, with an incompatible change.
# Verify that using that table nicely fails.
# Verify that other tables are not affected.
--source include/have_debug.inc
--source include/not_embedded.inc
--source include/have_perfschema.inc
call mtr.add_suppression(
"Column count of performance_schema.setup_instruments is wrong. "
"Expected 4, found 3. The table is probably corrupted");
--error ER_WRONG_NATIVE_TABLE_STRUCTURE
select * from performance_schema.setup_instruments limit 1;
--disable_result_log
select * from performance_schema.setup_consumers limit 1;
--enable_result_log