blob: 913972389ae0ed7c3b6dcfeefa7793f64b52b63f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
|
"Testing mysql_upgrade with PROCEDURE performance_schema.user_proc"
create procedure test.user_proc()
select "Not supposed to be here";
update mysql.proc set db='performance_schema' where name='user_proc';
<<<<<<< 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.proc where db='performance_schema';
name
user_proc
update mysql.proc set db='test' where name='user_proc';
drop procedure test.user_proc;
|
