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.5 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2013-01-29 15:10:47 +01:00
parent cf20de000b 52fbe44fbb
commit 0af4b6c6ee
372 changed files with 11040 additions and 2969 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
UPDATE performance_schema.setup_instruments SET enabled = 'NO', timed = 'YES';
UPDATE performance_schema.setup_instruments SET enabled = 'YES'
WHERE name LIKE 'wait/io/file/%';
flush status;
DROP TABLE IF EXISTS t1;
CREATE TABLE t1 (id INT PRIMARY KEY, b CHAR(100) DEFAULT 'initial value')
ENGINE=MyISAM;
@ -113,3 +114,19 @@ WHERE p.PROCESSLIST_ID = 1
GROUP BY h.EVENT_NAME
HAVING TOTAL_WAIT > 0;
UPDATE performance_schema.setup_instruments SET enabled = 'YES';
show status like "performance_schema%";
Variable_name Value
Performance_schema_cond_classes_lost 0
Performance_schema_cond_instances_lost 0
Performance_schema_file_classes_lost 0
Performance_schema_file_handles_lost 0
Performance_schema_file_instances_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_table_handles_lost 0
Performance_schema_table_instances_lost 0
Performance_schema_thread_classes_lost 0
Performance_schema_thread_instances_lost 0

25
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;
@ -112,3 +121,19 @@ test_fm2_rw_timed
Success
UPDATE performance_schema.setup_instruments SET enabled = 'YES';
DROP TABLE t1;
show status like "performance_schema%";
Variable_name Value
Performance_schema_cond_classes_lost 0
Performance_schema_cond_instances_lost 0
Performance_schema_file_classes_lost 0
Performance_schema_file_handles_lost 0
Performance_schema_file_instances_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_table_handles_lost 0
Performance_schema_table_instances_lost 0
Performance_schema_thread_classes_lost 0
Performance_schema_thread_instances_lost 0

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 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 1132: 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_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 'mutex_instances' 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_consumers' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line ###: Table 'threads' already exists
ERROR 1644 (HY000) at line ###: 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 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 1132: 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_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 'mutex_instances' 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_consumers' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line ###: Table 'threads' already exists
ERROR 1644 (HY000) at line ###: 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 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 1132: 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_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 'mutex_instances' 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_consumers' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line ###: Table 'threads' already exists
ERROR 1644 (HY000) at line ###: 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 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 1132: 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_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 'mutex_instances' 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_consumers' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line ###: Table 'threads' already exists
ERROR 1644 (HY000) at line ###: 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 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 1132: 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_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 'mutex_instances' 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_consumers' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_instruments' already exists
ERROR 1050 (42S01) at line ###: Table 'setup_timers' already exists
ERROR 1050 (42S01) at line ###: Table 'threads' already exists
ERROR 1644 (HY000) at line ###: Unexpected content found in the performance_schema database.
FATAL ERROR: Upgrade failed
select name from mysql.event where db='performance_schema';
name