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

5.3 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2012-01-13 15:50:02 +01:00
parent 8c2bcdf85f 6ca4ca7d37
commit 4f435bddfd
750 changed files with 17402 additions and 7153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,24 +8,24 @@ use performance_schema;
show tables like "user_table";
Tables_in_performance_schema (user_table)
user_table
ERROR 1050 (42S01) at line 182: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line 212: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line 226: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line 240: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line 261: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line 282: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 302: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 319: Table 'file_instances' already exists
ERROR 1050 (42S01) at line 338: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 358: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 375: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 393: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 411: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 427: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 444: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 460: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 477: Table 'threads' already exists
ERROR 1644 (HY000) at line 1125: Unexpected content found in the performance_schema database.
ERROR 1050 (42S01) at line 183: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line 213: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line 227: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line 241: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line 262: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line 283: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 303: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 320: Table 'file_instances' already exists
ERROR 1050 (42S01) at line 339: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 359: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 376: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 394: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 412: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 428: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 478: Table 'threads' already exists
ERROR 1644 (HY000) at line 1126: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
show tables like "user_table";
Tables_in_performance_schema (user_table)
@ -38,24 +38,24 @@ use performance_schema;
show tables like "user_view";
Tables_in_performance_schema (user_view)
user_view
ERROR 1050 (42S01) at line 182: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line 212: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line 226: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line 240: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line 261: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line 282: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 302: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 319: Table 'file_instances' already exists
ERROR 1050 (42S01) at line 338: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 358: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 375: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 393: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 411: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 427: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 444: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 460: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 477: Table 'threads' already exists
ERROR 1644 (HY000) at line 1125: Unexpected content found in the performance_schema database.
ERROR 1050 (42S01) at line 183: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line 213: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line 227: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line 241: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line 262: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line 283: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 303: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 320: Table 'file_instances' already exists
ERROR 1050 (42S01) at line 339: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 359: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 376: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 394: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 412: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 428: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 478: Table 'threads' already exists
ERROR 1644 (HY000) at line 1126: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
show tables like "user_view";
Tables_in_performance_schema (user_view)
@ -66,24 +66,24 @@ 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 182: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line 212: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line 226: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line 240: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line 261: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line 282: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 302: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 319: Table 'file_instances' already exists
ERROR 1050 (42S01) at line 338: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 358: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 375: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 393: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 411: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 427: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 444: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 460: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 477: Table 'threads' already exists
ERROR 1644 (HY000) at line 1125: Unexpected content found in the performance_schema database.
ERROR 1050 (42S01) at line 183: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line 213: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line 227: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line 241: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line 262: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line 283: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 303: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 320: Table 'file_instances' already exists
ERROR 1050 (42S01) at line 339: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 359: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 376: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 394: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 412: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 428: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 478: Table 'threads' already exists
ERROR 1644 (HY000) at line 1126: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@ -94,24 +94,24 @@ 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 182: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line 212: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line 226: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line 240: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line 261: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line 282: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 302: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 319: Table 'file_instances' already exists
ERROR 1050 (42S01) at line 338: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 358: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 375: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 393: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 411: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 427: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 444: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 460: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 477: Table 'threads' already exists
ERROR 1644 (HY000) at line 1125: Unexpected content found in the performance_schema database.
ERROR 1050 (42S01) at line 183: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line 213: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line 227: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line 241: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line 262: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line 283: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 303: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 320: Table 'file_instances' already exists
ERROR 1050 (42S01) at line 339: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 359: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 376: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 394: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 412: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 428: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 478: Table 'threads' already exists
ERROR 1644 (HY000) at line 1126: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.proc where db='performance_schema';
name
@ -122,24 +122,24 @@ 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 182: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line 212: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line 226: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line 240: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line 261: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line 282: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 302: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 319: Table 'file_instances' already exists
ERROR 1050 (42S01) at line 338: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 358: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 375: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 393: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 411: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 427: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 444: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 460: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 477: Table 'threads' already exists
ERROR 1644 (HY000) at line 1125: Unexpected content found in the performance_schema database.
ERROR 1050 (42S01) at line 183: Table 'cond_instances' already exists
ERROR 1050 (42S01) at line 213: Table 'events_waits_current' already exists
ERROR 1050 (42S01) at line 227: Table 'events_waits_history' already exists
ERROR 1050 (42S01) at line 241: Table 'events_waits_history_long' already exists
ERROR 1050 (42S01) at line 262: Table 'events_waits_summary_by_instance' already exists
ERROR 1050 (42S01) at line 283: Table 'events_waits_summary_by_thread_by_event_name' already exists
ERROR 1050 (42S01) at line 303: Table 'events_waits_summary_global_by_event_name' already exists
ERROR 1050 (42S01) at line 320: Table 'file_instances' already exists
ERROR 1050 (42S01) at line 339: Table 'file_summary_by_event_name' already exists
ERROR 1050 (42S01) at line 359: Table 'file_summary_by_instance' already exists
ERROR 1050 (42S01) at line 376: Table 'mutex_instances' already exists
ERROR 1050 (42S01) at line 394: Table 'performance_timers' already exists
ERROR 1050 (42S01) at line 412: Table 'rwlock_instances' already exists
ERROR 1050 (42S01) at line 428: Table 'setup_consumers' already exists
ERROR 1050 (42S01) at line 445: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line 461: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line 478: Table 'threads' already exists
ERROR 1644 (HY000) at line 1126: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.event where db='performance_schema';
name