summaryrefslogtreecommitdiff
path: root/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
diff options
context:
space:
mode:
Diffstat (limited to 'mysql-test/suite/perfschema/r/pfs_upgrade_event.result')
-rw-r--r--mysql-test/suite/perfschema/r/pfs_upgrade_event.result91
1 files changed, 91 insertions, 0 deletions
diff --git a/mysql-test/suite/perfschema/r/pfs_upgrade_event.result b/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
index cbaeec201e0..8407850b2b5 100644
--- a/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
+++ b/mysql-test/suite/perfschema/r/pfs_upgrade_event.result
@@ -4,6 +4,97 @@ select "not supposed to be here";
Warnings:
Warning 1105 Event scheduler is switched off, use SET GLOBAL event_scheduler=ON to enable it.
update mysql.event set db='performance_schema' where name='user_event';
+<<<<<<< HEAD
+=======
+mysql_upgrade: [ERROR] 1050: Table 'cond_instances' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_waits_current' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_waits_history' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_waits_history_long' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_instance' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_host_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_user_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_account_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_by_thread_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_waits_summary_global_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'file_instances' already exists
+mysql_upgrade: [ERROR] 1050: Table 'file_summary_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'file_summary_by_instance' already exists
+mysql_upgrade: [ERROR] 1050: Table 'socket_instances' already exists
+mysql_upgrade: [ERROR] 1050: Table 'socket_summary_by_instance' already exists
+mysql_upgrade: [ERROR] 1050: Table 'socket_summary_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'host_cache' already exists
+mysql_upgrade: [ERROR] 1050: Table 'mutex_instances' already exists
+mysql_upgrade: [ERROR] 1050: Table 'objects_summary_global_by_type' already exists
+mysql_upgrade: [ERROR] 1050: Table 'performance_timers' already exists
+mysql_upgrade: [ERROR] 1050: Table 'rwlock_instances' already exists
+mysql_upgrade: [ERROR] 1050: Table 'setup_actors' already exists
+mysql_upgrade: [ERROR] 1050: Table 'setup_consumers' already exists
+mysql_upgrade: [ERROR] 1050: Table 'setup_instruments' already exists
+mysql_upgrade: [ERROR] 1050: Table 'setup_objects' already exists
+mysql_upgrade: [ERROR] 1050: Table 'setup_timers' already exists
+mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_index_usage' already exists
+mysql_upgrade: [ERROR] 1050: Table 'table_io_waits_summary_by_table' already exists
+mysql_upgrade: [ERROR] 1050: Table 'table_lock_waits_summary_by_table' already exists
+mysql_upgrade: [ERROR] 1050: Table 'threads' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_stages_current' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_stages_history' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_stages_history_long' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_thread_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_host_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_user_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_by_account_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_stages_summary_global_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_statements_current' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_statements_history' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_statements_history_long' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_thread_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_host_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_user_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_account_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_global_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_transactions_current' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_transactions_history' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_transactions_history_long' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_thread_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_host_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_user_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_by_account_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_transactions_summary_global_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'hosts' already exists
+mysql_upgrade: [ERROR] 1050: Table 'users' already exists
+mysql_upgrade: [ERROR] 1050: Table 'accounts' already exists
+mysql_upgrade: [ERROR] 1050: Table 'memory_summary_global_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_thread_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_account_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_host_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'memory_summary_by_user_by_event_name' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_digest' already exists
+mysql_upgrade: [ERROR] 1050: Table 'events_statements_summary_by_program' already exists
+mysql_upgrade: [ERROR] 1050: Table 'prepared_statements_instances' already exists
+mysql_upgrade: [ERROR] 1050: Table 'replication_connection_configuration' already exists
+mysql_upgrade: [ERROR] 1050: Table 'replication_group_member_stats' already exists
+mysql_upgrade: [ERROR] 1050: Table 'replication_group_members' already exists
+mysql_upgrade: [ERROR] 1050: Table 'replication_connection_status' already exists
+mysql_upgrade: [ERROR] 1050: Table 'replication_applier_configuration' already exists
+mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status' already exists
+mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status_by_coordinator' already exists
+mysql_upgrade: [ERROR] 1050: Table 'replication_applier_status_by_worker' already exists
+mysql_upgrade: [ERROR] 1050: Table 'session_connect_attrs' already exists
+mysql_upgrade: [ERROR] 1050: Table 'session_account_connect_attrs' already exists
+mysql_upgrade: [ERROR] 1050: Table 'table_handles' already exists
+mysql_upgrade: [ERROR] 1050: Table 'metadata_locks' already exists
+mysql_upgrade: [ERROR] 1050: Table 'user_variables_by_thread' already exists
+mysql_upgrade: [ERROR] 1050: Table 'variables_by_thread' already exists
+mysql_upgrade: [ERROR] 1050: Table 'global_variables' already exists
+mysql_upgrade: [ERROR] 1050: Table 'session_variables' already exists
+mysql_upgrade: [ERROR] 1050: Table 'status_by_thread' already exists
+mysql_upgrade: [ERROR] 1050: Table 'status_by_user' already exists
+mysql_upgrade: [ERROR] 1050: Table 'status_by_host' already exists
+mysql_upgrade: [ERROR] 1050: Table 'status_by_account' already exists
+mysql_upgrade: [ERROR] 1050: Table 'global_status' already exists
+mysql_upgrade: [ERROR] 1050: Table 'session_status' already exists
+mysql_upgrade: [ERROR] 1644: Unexpected content found in the performance_schema database.
+>>>>>>> merge-perfschema-5.7
select name from mysql.event where db='performance_schema';
name
user_event