database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

perfschema compilation, test and misc fixes

Browse Source
This commit is contained in:
Sergei Golubchik
2020-02-15 18:25:57 +01:00
parent 81cffda2e6
commit 7af733a5a2
403 changed files with 20147 additions and 63173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mysql-test/suite/perfschema/disabled.def
View File

@@ -24,3 +24,34 @@ binlog_ok_row: needs slave_relay_log_info
binlog_ok_stmt: needs slave_relay_log_info
server_init : Nirbhay TODO: Fix the test
show_sanity:
threads_mysql_freebsd:
transaction_gtid: needs to be updated for MariaDB gtids
ddl_replication_applier_status_by_worker: todo
ddl_replication_connection_status: todo
dml_replication_applier_status_by_worker: todo
dml_replication_connection_status: todo
dml_replication_group_member_stats: todo?
ddl_replication_group_member_stats: todo?
ddl_replication_group_members: todo?
dml_replication_group_members: todo?
replication_group_members: todo?
replication_group_member_stats: todo?
rpl_group_member_stats: todo?
rpl_group_members: todo?
ddl_session_variables: todo
ddl_global_variables: todo
ddl_variables_by_thread: todo
dml_global_variables: todo
dml_session_variables: todo
dml_variables_by_thread: todo
variables_by_thread: todo
show_coverage: todo
show_misc: todo
show_plugin: todo
status_reprepare:why P_S filters out Com_* variables?

1
mysql-test/suite/perfschema/include/memory_aggregate_setup.inc
View File

@@ -54,6 +54,7 @@
--source include/have_perfschema.inc
--source include/no_protocol.inc
--source ../include/wait_for_pfs_thread_count.inc
--source include/not_windows.inc
--disable_query_log

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

@@ -3,6 +3,7 @@
#
--source include/no_protocol.inc
--source include/have_innodb.inc
--echo # SET-UP
CREATE DATABASE nested_sp;
@@ -16,7 +17,7 @@ CREATE TABLE t1(
CREATE TABLE t2(
n INT UNSIGNED NOT NULL,
f BIGINT UNSIGNED
);
) engine=innodb;
--echo ############################
--echo # Creating Stored Programs #

5
mysql-test/suite/perfschema/include/program_setup.inc
View File

@@ -3,6 +3,7 @@
#
--source include/no_protocol.inc
--source include/have_innodb.inc
--echo # SET-UP
@@ -12,12 +13,12 @@ USE stored_programs;
CREATE TABLE t1(
i INT NOT NULL,
j INT
);
) engine=innodb;
CREATE TABLE t2(
name CHAR(16) NOT NULL DEFAULT '',
id INT NOT NULL
);
) engine=innodb;
CREATE TABLE t3(
d DATE,

29
mysql-test/suite/perfschema/include/show_plugin_verifier_56.inc
View File

@@ -1,29 +0,0 @@
--disable_warnings
--echo
SHOW GLOBAL STATUS LIKE "example_%";
--echo
SHOW SESSION STATUS LIKE "example_%";
--echo
SHOW GLOBAL VARIABLES LIKE "example_%";
--echo
SHOW SESSION VARIABLES LIKE "example_%";
--echo
SELECT variable_name, variable_value FROM information_schema.global_status WHERE variable_name LIKE "example_%";
--echo
SELECT variable_name, variable_value FROM information_schema.session_status WHERE variable_name LIKE "example_%";
--echo
SELECT variable_name, variable_value FROM information_schema.global_variables WHERE variable_name LIKE "example_%";
--echo
SELECT variable_name, variable_value FROM information_schema.session_variables WHERE variable_name LIKE "example_%";
#
# Force sync of local and global system variables.
#
--disable_result_log
--disable_query_log
SELECT variable_name, variable_value FROM performance_schema.variables_by_thread WHERE variable_name LIKE "example_%";
--enable_query_log
--enable_result_log
--enable_warnings

10
mysql-test/suite/perfschema/include/start_server_common.inc
View File

@@ -87,20 +87,20 @@ select * from performance_schema.table_lock_waits_summary_by_table;
select * from performance_schema.threads;
select * from performance_schema.users;
select * from performance_schema.replication_connection_configuration;
select * from performance_schema.replication_connection_status;
#select * from performance_schema.replication_connection_status;
select * from performance_schema.replication_applier_configuration;
select * from performance_schema.replication_applier_status;
select * from performance_schema.replication_applier_status_by_coordinator;
select * from performance_schema.replication_applier_status_by_worker;
#select * from performance_schema.replication_applier_status_by_worker;
select * from performance_schema.global_status;
select * from performance_schema.status_by_thread;
select * from performance_schema.status_by_user;
select * from performance_schema.status_by_host;
select * from performance_schema.status_by_account;
select * from performance_schema.session_status;
select * from performance_schema.global_variables;
select * from performance_schema.variables_by_thread;
select * from performance_schema.session_variables;
#select * from performance_schema.global_variables;
#select * from performance_schema.variables_by_thread;
#select * from performance_schema.session_variables;
--enable_result_log
# This has a stable output, printing the result:

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

@@ -14,8 +14,7 @@ eval select event_name,
order by thread_id, event_id;
# In case of failures, this will tell if table io are lost.
show status where Variable_name like 'performance_schema_%' and
Variable_name not like 'performance_schema_%_classes_lost';
show global status like 'performance_schema_%';
# Cleanup
truncate performance_schema.events_waits_history_long;

11
mysql-test/suite/perfschema/include/transaction_nested_events_verifier.inc
View File

@@ -29,15 +29,14 @@ if(!$success)
--echo # Verify
--echo #========================================================================
SELECT event_id from performance_schema.events_transactions_history_long
SELECT event_id into @base_tx_event_id
from performance_schema.events_transactions_history_long
where (THREAD_ID = @con1_thread_id)
order by event_id limit 1
into @base_tx_event_id;
order by event_id limit 1;
SELECT event_id from performance_schema.events_statements_history_long
SELECT event_id into @base_stmt_event_id from performance_schema.events_statements_history_long
where (THREAD_ID = @con1_thread_id)
order by event_id limit 1
into @base_stmt_event_id;
order by event_id limit 1;
select if(@base_tx_event_id < @base_stmt_event_id,
@base_tx_event_id - 1,

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

@@ -13,5 +13,3 @@
--remove_file $MYSQLTEST_VARDIR/tmp/out_file
--remove_file $MYSQLTEST_VARDIR/tmp/err_file
--remove_file $MYSQLD_DATADIR/mysql_upgrade_info
--source include/mysql_upgrade_cleanup.inc

35
mysql-test/suite/perfschema/r/alter_table_progress.result
View File

@@ -1,17 +1,23 @@
connect con1, localhost, root, , ;
drop table if exists t1;
create table t1(a int) engine = myisam;
insert into t1 values (1), (2), (3), (4), (5);
connection default;
update performance_schema.threads
set instrumented = 'NO'
where processlist_id = connection_id();
truncate table performance_schema.events_statements_history_long;
truncate table performance_schema.events_stages_history_long;
connection con1;
SET DEBUG_SYNC='RESET';
SET DEBUG_SYNC='copy_data_between_tables_before SIGNAL found_row WAIT_FOR wait_row EXECUTE 5';
ALTER TABLE t1 engine = innodb;;
connection default;
SET DEBUG_SYNC='now WAIT_FOR found_row';
select event_id from performance_schema.events_statements_current
where thread_id = @con1_thread_id into @con1_stmt_id;
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
from performance_schema.events_stages_current
where (thread_id = @con1_thread_id);
@@ -46,9 +52,11 @@ where (thread_id = @con1_thread_id);
EVENT_NAME WORK_COMPLETED WORK_ESTIMATED
stage/sql/copy to tmp table 4 5
SET DEBUG_SYNC='now SIGNAL wait_row';
connection con1;
select "After payload";
After payload
After payload
connection default;
Dumping ALTER TABLE stages
select EVENT_NAME, WORK_COMPLETED, WORK_ESTIMATED
from performance_schema.events_stages_history_long
@@ -58,22 +66,35 @@ order by thread_id, event_id;
EVENT_NAME WORK_COMPLETED WORK_ESTIMATED
stage/sql/starting NULL NULL
stage/sql/checking permissions NULL NULL
stage/sql/checking permissions NULL NULL
stage/sql/init NULL NULL
stage/sql/init for update NULL NULL
stage/sql/Opening tables NULL NULL
stage/sql/After opening tables NULL NULL
stage/sql/setup NULL NULL
stage/sql/creating table NULL NULL
stage/sql/After create NULL NULL
stage/sql/System lock NULL NULL
stage/sql/table lock NULL NULL
stage/sql/After create NULL NULL
stage/sql/copy to tmp table 5 5
stage/sql/rename result table NULL NULL
stage/sql/end NULL NULL
stage/sql/query end NULL NULL
stage/sql/Enabling keys NULL NULL
stage/sql/Rename result table NULL NULL
stage/sql/Unlocking tables NULL NULL
stage/sql/Rename result table NULL NULL
stage/sql/End of update loop NULL NULL
stage/sql/Query end NULL NULL
stage/sql/Commit NULL NULL
stage/sql/closing tables NULL NULL
stage/sql/freeing items NULL NULL
stage/sql/cleaning up NULL NULL
stage/sql/Unlocking tables NULL NULL
stage/sql/closing tables NULL NULL
stage/sql/Commit implicit NULL NULL
stage/sql/Starting cleanup NULL NULL
stage/sql/Freeing items NULL NULL
stage/sql/Reset for next command NULL NULL
SET DEBUG_SYNC='RESET';
connection con1;
drop table t1;
disconnect con1;
connection default;
update performance_schema.threads
set instrumented = 'YES'
where processlist_id = connection_id();

4
mysql-test/suite/perfschema/r/bad_option.result
View File

@@ -1,4 +1,8 @@
FOUND 1 /\[ERROR\].*unknown variable 'performance-schema-enabled=maybe'/ in my_restart.err
# Server start with invalid startup option value 'performance-schema-enabled=maybe' : pass
FOUND 1 /\[ERROR\].*unknown variable 'performance-schema-max_=12'/ in my_restart.err
# Server start with ambigous startup option 'performance-schema-max_=12' : pass
FOUND 1 /\[ERROR\].*unknown option '--performance-schema-unknown_99'/ in my_restart.err
# Server start with invalid startup option '--performance-schema-unknown_99' : pass
FOUND 1 /Can.t change dir to .*bad_option_h_param/ in my_restart.err
# Server start with invalid startup option value '--datadir=bad_option_h_param' : pass

33
mysql-test/suite/perfschema/r/batch_table_io_func.result
View File

@@ -53,12 +53,15 @@ select 10*X.v + Y.v, 100*X.v + 10*Y.v + Z.v, 100*X.v + 10*Y.v + Z.v
from t0 X, t0 Y, t0 Z;
analyze table t1;
Table Op Msg_type Msg_text
test.t1 analyze status Engine-independent statistics collected
test.t1 analyze status OK
analyze table t2;
Table Op Msg_type Msg_text
test.t2 analyze status Engine-independent statistics collected
test.t2 analyze status OK
analyze table t3;
Table Op Msg_type Msg_text
test.t3 analyze status Engine-independent statistics collected
test.t3 analyze status OK
select * from t1 order by a;
id1 a
@@ -111,14 +114,14 @@ id2 id3 c
61 610 610
61 611 611
61 612 612
explain select t1.*, t2.*, t3.*
explain extended select t1.*, t2.*, t3.*
from t1 join t2 using (id1) join t3 using (id2);
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
1 SIMPLE t1 NULL ALL NULL NULL NULL NULL 10 100.00 NULL
1 SIMPLE t2 NULL ALL NULL NULL NULL NULL 100 10.00 Using where; Using join buffer (Block Nested Loop)
1 SIMPLE t3 NULL ALL NULL NULL NULL NULL 1000 10.00 Using where; Using join buffer (Block Nested Loop)
id select_type table type possible_keys key key_len ref rows filtered Extra
1 SIMPLE t1 ALL NULL NULL NULL NULL 10 100.00
1 SIMPLE t2 ALL NULL NULL NULL NULL 100 100.00 Using where; Using join buffer (flat, BNL join)
1 SIMPLE t3 ALL NULL NULL NULL NULL 1000 100.00 Using where; Using join buffer (incremental, BNL join)
Warnings:
Note 1003 /* select#1 */ select `test`.`t1`.`id1` AS `id1`,`test`.`t1`.`a` AS `a`,`test`.`t2`.`id1` AS `id1`,`test`.`t2`.`id2` AS `id2`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`id2` AS `id2`,`test`.`t3`.`id3` AS `id3`,`test`.`t3`.`c` AS `c` from `test`.`t1` join `test`.`t2` join `test`.`t3` where ((`test`.`t2`.`id1` = `test`.`t1`.`id1`) and (`test`.`t3`.`id2` = `test`.`t2`.`id2`))
Note 1003 select `test`.`t1`.`id1` AS `id1`,`test`.`t1`.`a` AS `a`,`test`.`t2`.`id1` AS `id1`,`test`.`t2`.`id2` AS `id2`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`id2` AS `id2`,`test`.`t3`.`id3` AS `id3`,`test`.`t3`.`c` AS `c` from `test`.`t1` join `test`.`t2` join `test`.`t3` where `test`.`t3`.`id2` = `test`.`t2`.`id2` and `test`.`t2`.`id1` = `test`.`t1`.`id1`
call before_payload();
select t1.*, t2.*, t3.*
from t1 join t2 using (id1) join t3 using (id2);
@@ -126,10 +129,13 @@ call after_payload();
number_seen OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME INDEX_NAME OPERATION NUMBER_OF_BYTES
11 TABLE test t1 NULL fetch 1
1 TABLE test t1 NULL read external NULL
1 TABLE test t1 NULL read normal NULL
101 TABLE test t2 NULL fetch 1
1 TABLE test t2 NULL read external NULL
1 TABLE test t2 NULL read normal NULL
1 TABLE test t3 NULL fetch 1000
1 TABLE test t3 NULL read external NULL
1 TABLE test t3 NULL read normal NULL
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME INDEX_NAME COUNT_STAR COUNT_READ COUNT_WRITE
TABLE test t0 NULL 0 0 0
TABLE test t1 NULL 11 11 0
@@ -145,14 +151,14 @@ alter table t2 add unique index(id2);
alter table t2 add index(id1);
alter table t3 add unique index(id3);
alter table t3 add index(id2);
explain select t1.*, t2.*, t3.*
explain extended select t1.*, t2.*, t3.*
from t1 join t2 using (id1) join t3 using (id2);
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
1 SIMPLE t1 NULL ALL id1 NULL NULL NULL 10 100.00 Using where
1 SIMPLE t2 NULL ref id2,id1 id1 5 test.t1.id1 10 100.00 Using where
1 SIMPLE t3 NULL ref id2 id2 5 test.t2.id2 10 100.00 NULL
id select_type table type possible_keys key key_len ref rows filtered Extra
1 SIMPLE t1 ALL id1 NULL NULL NULL 10 100.00 Using where
1 SIMPLE t2 ref id2,id1 id1 5 test.t1.id1 10 100.00 Using where
1 SIMPLE t3 ref id2 id2 5 test.t2.id2 10 100.00
Warnings:
Note 1003 /* select#1 */ select `test`.`t1`.`id1` AS `id1`,`test`.`t1`.`a` AS `a`,`test`.`t2`.`id1` AS `id1`,`test`.`t2`.`id2` AS `id2`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`id2` AS `id2`,`test`.`t3`.`id3` AS `id3`,`test`.`t3`.`c` AS `c` from `test`.`t1` join `test`.`t2` join `test`.`t3` where ((`test`.`t2`.`id1` = `test`.`t1`.`id1`) and (`test`.`t3`.`id2` = `test`.`t2`.`id2`))
Note 1003 select `test`.`t1`.`id1` AS `id1`,`test`.`t1`.`a` AS `a`,`test`.`t2`.`id1` AS `id1`,`test`.`t2`.`id2` AS `id2`,`test`.`t2`.`b` AS `b`,`test`.`t3`.`id2` AS `id2`,`test`.`t3`.`id3` AS `id3`,`test`.`t3`.`c` AS `c` from `test`.`t1` join `test`.`t2` join `test`.`t3` where `test`.`t3`.`id2` = `test`.`t2`.`id2` and `test`.`t2`.`id1` = `test`.`t1`.`id1`
call before_payload();
select t1.*, t2.*, t3.*
from t1 join t2 using (id1) join t3 using (id2);
@@ -160,10 +166,13 @@ call after_payload();
number_seen OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME INDEX_NAME OPERATION NUMBER_OF_BYTES
11 TABLE test t1 NULL fetch 1
1 TABLE test t1 id1 read external NULL
1 TABLE test t1 id1 read normal NULL
110 TABLE test t2 id1 fetch 1
1 TABLE test t2 id2 read external NULL
1 TABLE test t2 id2 read normal NULL
100 TABLE test t3 id2 fetch 10
1 TABLE test t3 id3 read external NULL
1 TABLE test t3 id3 read normal NULL
OBJECT_TYPE OBJECT_SCHEMA OBJECT_NAME INDEX_NAME COUNT_STAR COUNT_READ COUNT_WRITE
TABLE test t0 NULL 0 0 0
TABLE test t1 NULL 11 11 0

3
mysql-test/suite/perfschema/r/connect_attrs.result
View File

@@ -37,11 +37,8 @@ SELECT COUNT(DISTINCT PROCESSLIST_ID)
FROM performance_schema.session_connect_attrs;
COUNT(DISTINCT PROCESSLIST_ID)
2
<<<<<<< HEAD
connection non_privileged_user;
=======
# must return 1
>>>>>>> merge-perfschema-5.7
SELECT COUNT(DISTINCT PROCESSLIST_ID)
FROM performance_schema.session_account_connect_attrs;
COUNT(DISTINCT PROCESSLIST_ID)

159
mysql-test/suite/perfschema/r/connection.result
View File

@@ -1,17 +1,3 @@
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
call dump_all();
processlist_user processlist_host
root localhost
@@ -25,12 +11,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con1a, localhost, user1, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user1 in con1a" as status;
status
user1 in con1a
@@ -50,12 +31,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con1b, localhost, user1, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user1 in con1b" as status;
status
user1 in con1b
@@ -76,12 +52,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con1c, localhost, user1, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user1 in con1c" as status;
status
user1 in con1c
@@ -103,12 +74,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con2a, localhost, user2, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user2 in con2a" as status;
status
user2 in con2a
@@ -133,12 +99,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con2b, localhost, user2, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user2 in con2b" as status;
status
user2 in con2b
@@ -164,12 +125,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con2c, localhost, user2, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user2 in con2c" as status;
status
user2 in con2c
@@ -196,12 +152,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con3a, localhost, user3, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user3 in con3a" as status;
status
user3 in con3a
@@ -231,12 +182,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con3b, localhost, user3, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user3 in con3b" as status;
status
user3 in con3b
@@ -267,12 +213,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con3c, localhost, user3, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user3 in con3c" as status;
status
user3 in con3c
@@ -304,13 +245,8 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connection default;
disconnect con1a;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con1a disconnected" as status;
status
con1a disconnected
@@ -341,12 +277,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
disconnect con2a;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con2a disconnected" as status;
status
con2a disconnected
@@ -376,12 +307,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
disconnect con3a;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con3a disconnected" as status;
status
con3a disconnected
@@ -410,8 +336,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.accounts;
call dump_all();
processlist_user processlist_host
@@ -438,8 +362,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.users;
call dump_all();
processlist_user processlist_host
@@ -466,8 +388,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.hosts;
call dump_all();
processlist_user processlist_host
@@ -494,12 +414,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con4a, localhost, user4, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user4 in con4a" as status;
status
user4 in con4a
@@ -531,12 +446,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con4b, localhost, user4, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user4 in con4b" as status;
status
user4 in con4b
@@ -569,12 +479,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con4c, localhost, user4, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user4 in con4c" as status;
status
user4 in con4c
@@ -608,13 +513,8 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connection default;
disconnect con1b;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con1b disconnected" as status;
status
con1b disconnected
@@ -647,12 +547,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
disconnect con2b;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con2b disconnected" as status;
status
con2b disconnected
@@ -684,12 +579,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
disconnect con3b;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con3b disconnected" as status;
status
con3b disconnected
@@ -720,12 +610,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
disconnect con1c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con1c disconnected" as status;
status
con1c disconnected
@@ -755,12 +640,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
disconnect con2c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con2c disconnected" as status;
status
con2c disconnected
@@ -789,12 +669,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
disconnect con3c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con3c disconnected" as status;
status
con3c disconnected
@@ -822,8 +697,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.accounts;
call dump_all();
processlist_user processlist_host
@@ -846,8 +719,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.users;
call dump_all();
processlist_user processlist_host
@@ -867,8 +738,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.hosts;
call dump_all();
processlist_user processlist_host
@@ -888,12 +757,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con5a, localhost, user5, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user5 in con5a" as status;
status
user5 in con5a
@@ -918,12 +782,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con5b, localhost, user5, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user5 in con5b" as status;
status
user5 in con5b
@@ -949,12 +808,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con5c, localhost, user5, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user5 in con5c" as status;
status
user5 in con5c
@@ -981,7 +835,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connection default;
disconnect con4a;
disconnect con4b;
@@ -989,10 +842,6 @@ disconnect con4c;
disconnect con5a;
disconnect con5b;
disconnect con5c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con 5a, 5b, 5c, 6a, 6b, 6c disconnected" as status;
status
con 5a, 5b, 5c, 6a, 6b, 6c disconnected
@@ -1013,8 +862,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.hosts;
call dump_all();
processlist_user processlist_host
@@ -1031,8 +878,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.users;
call dump_all();
processlist_user processlist_host
@@ -1047,8 +892,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.accounts;
call dump_all();
processlist_user processlist_host
@@ -1063,5 +906,3 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead

159
mysql-test/suite/perfschema/r/connection_3a.result
View File

@@ -1,17 +1,3 @@
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
call dump_all();
processlist_user processlist_host
root localhost
@@ -25,12 +11,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con1a, localhost, user1, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user1 in con1a" as status;
status
user1 in con1a
@@ -50,12 +31,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con1b, localhost, user1, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user1 in con1b" as status;
status
user1 in con1b
@@ -76,12 +52,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con1c, localhost, user1, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user1 in con1c" as status;
status
user1 in con1c
@@ -103,12 +74,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con2a, localhost, user2, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user2 in con2a" as status;
status
user2 in con2a
@@ -132,12 +98,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 1
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con2b, localhost, user2, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user2 in con2b" as status;
status
user2 in con2b
@@ -162,12 +123,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 2
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con2c, localhost, user2, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user2 in con2c" as status;
status
user2 in con2c
@@ -193,12 +149,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 3
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con3a, localhost, user3, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user3 in con3a" as status;
status
user3 in con3a
@@ -226,12 +177,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 4
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con3b, localhost, user3, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user3 in con3b" as status;
status
user3 in con3b
@@ -260,12 +206,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 5
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con3c, localhost, user3, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user3 in con3c" as status;
status
user3 in con3c
@@ -295,13 +236,8 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 6
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connection default;
disconnect con1a;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con1a disconnected" as status;
status
con1a disconnected
@@ -330,12 +266,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 6
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
disconnect con2a;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con2a disconnected" as status;
status
con2a disconnected
@@ -363,12 +294,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 6
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
disconnect con3a;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con3a disconnected" as status;
status
con3a disconnected
@@ -395,8 +321,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 6
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.accounts;
call dump_all();
processlist_user processlist_host
@@ -421,8 +345,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 6
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.users;
call dump_all();
processlist_user processlist_host
@@ -447,8 +369,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 6
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.hosts;
call dump_all();
processlist_user processlist_host
@@ -473,12 +393,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 6
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con4a, localhost, user4, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user4 in con4a" as status;
status
user4 in con4a
@@ -507,12 +422,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 7
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con4b, localhost, user4, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user4 in con4b" as status;
status
user4 in con4b
@@ -542,12 +452,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 8
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con4c, localhost, user4, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user4 in con4c" as status;
status
user4 in con4c
@@ -578,13 +483,8 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connection default;
disconnect con1b;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con1b disconnected" as status;
status
con1b disconnected
@@ -614,12 +514,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
disconnect con2b;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con2b disconnected" as status;
status
con2b disconnected
@@ -648,12 +543,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
disconnect con3b;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con3b disconnected" as status;
status
con3b disconnected
@@ -681,12 +571,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
disconnect con1c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con1c disconnected" as status;
status
con1c disconnected
@@ -713,12 +598,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
disconnect con2c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con2c disconnected" as status;
status
con2c disconnected
@@ -744,12 +624,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
disconnect con3c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con3c disconnected" as status;
status
con3c disconnected
@@ -774,8 +649,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.accounts;
call dump_all();
processlist_user processlist_host
@@ -797,8 +670,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.users;
call dump_all();
processlist_user processlist_host
@@ -817,8 +688,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.hosts;
call dump_all();
processlist_user processlist_host
@@ -837,12 +706,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con5a, localhost, user5, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user5 in con5a" as status;
status
user5 in con5a
@@ -866,12 +730,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con5b, localhost, user5, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user5 in con5b" as status;
status
user5 in con5b
@@ -896,12 +755,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con5c, localhost, user5, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user5 in con5c" as status;
status
user5 in con5c
@@ -927,7 +781,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connection default;
disconnect con4a;
disconnect con4b;
@@ -935,10 +788,6 @@ disconnect con4c;
disconnect con5a;
disconnect con5b;
disconnect con5c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con 5a, 5b, 5c, 6a, 6b, 6c disconnected" as status;
status
con 5a, 5b, 5c, 6a, 6b, 6c disconnected
@@ -958,8 +807,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.hosts;
call dump_all();
processlist_user processlist_host
@@ -976,8 +823,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.users;
call dump_all();
processlist_user processlist_host
@@ -992,8 +837,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.accounts;
call dump_all();
processlist_user processlist_host
@@ -1008,5 +851,3 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead

159
mysql-test/suite/perfschema/r/connection_3a_3u.result
View File

@@ -1,17 +1,3 @@
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
call dump_all();
processlist_user processlist_host
root localhost
@@ -25,12 +11,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con1a, localhost, user1, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user1 in con1a" as status;
status
user1 in con1a
@@ -50,12 +31,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con1b, localhost, user1, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user1 in con1b" as status;
status
user1 in con1b
@@ -76,12 +52,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con1c, localhost, user1, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user1 in con1c" as status;
status
user1 in con1c
@@ -103,12 +74,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con2a, localhost, user2, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user2 in con2a" as status;
status
user2 in con2a
@@ -131,12 +97,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 1
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 1
<<<<<<< HEAD
connect con2b, localhost, user2, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user2 in con2b" as status;
status
user2 in con2b
@@ -160,12 +121,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 2
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 2
<<<<<<< HEAD
connect con2c, localhost, user2, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user2 in con2c" as status;
status
user2 in con2c
@@ -190,12 +146,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 3
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
<<<<<<< HEAD
connect con3a, localhost, user3, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user3 in con3a" as status;
status
user3 in con3a
@@ -221,12 +172,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 4
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 4
<<<<<<< HEAD
connect con3b, localhost, user3, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user3 in con3b" as status;
status
user3 in con3b
@@ -253,12 +199,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 5
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 5
<<<<<<< HEAD
connect con3c, localhost, user3, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user3 in con3c" as status;
status
user3 in con3c
@@ -286,13 +227,8 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 6
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 6
<<<<<<< HEAD
connection default;
disconnect con1a;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con1a disconnected" as status;
status
con1a disconnected
@@ -319,12 +255,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 6
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 6
<<<<<<< HEAD
disconnect con2a;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con2a disconnected" as status;
status
con2a disconnected
@@ -350,12 +281,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 6
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 6
<<<<<<< HEAD
disconnect con3a;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con3a disconnected" as status;
status
con3a disconnected
@@ -380,8 +306,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 6
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 6
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.accounts;
call dump_all();
processlist_user processlist_host
@@ -404,8 +328,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 6
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 6
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.users;
call dump_all();
processlist_user processlist_host
@@ -428,8 +350,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 6
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 6
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.hosts;
call dump_all();
processlist_user processlist_host
@@ -452,12 +372,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 6
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 6
<<<<<<< HEAD
connect con4a, localhost, user4, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user4 in con4a" as status;
status
user4 in con4a
@@ -483,12 +398,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 7
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 7
<<<<<<< HEAD
connect con4b, localhost, user4, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user4 in con4b" as status;
status
user4 in con4b
@@ -515,12 +425,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 8
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 8
<<<<<<< HEAD
connect con4c, localhost, user4, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user4 in con4c" as status;
status
user4 in con4c
@@ -548,13 +453,8 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
<<<<<<< HEAD
connection default;
disconnect con1b;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con1b disconnected" as status;
status
con1b disconnected
@@ -581,12 +481,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
<<<<<<< HEAD
disconnect con2b;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con2b disconnected" as status;
status
con2b disconnected
@@ -612,12 +507,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
<<<<<<< HEAD
disconnect con3b;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con3b disconnected" as status;
status
con3b disconnected
@@ -642,12 +532,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
<<<<<<< HEAD
disconnect con1c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con1c disconnected" as status;
status
con1c disconnected
@@ -671,12 +556,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
<<<<<<< HEAD
disconnect con2c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con2c disconnected" as status;
status
con2c disconnected
@@ -699,12 +579,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
<<<<<<< HEAD
disconnect con3c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con3c disconnected" as status;
status
con3c disconnected
@@ -726,8 +601,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.accounts;
call dump_all();
processlist_user processlist_host
@@ -746,8 +619,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.users;
call dump_all();
processlist_user processlist_host
@@ -765,8 +636,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.hosts;
call dump_all();
processlist_user processlist_host
@@ -784,12 +653,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
<<<<<<< HEAD
connect con5a, localhost, user5, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user5 in con5a" as status;
status
user5 in con5a
@@ -812,12 +676,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
<<<<<<< HEAD
connect con5b, localhost, user5, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user5 in con5b" as status;
status
user5 in con5b
@@ -841,12 +700,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
<<<<<<< HEAD
connect con5c, localhost, user5, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user5 in con5c" as status;
status
user5 in con5c
@@ -871,7 +725,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
<<<<<<< HEAD
connection default;
disconnect con4a;
disconnect con4b;
@@ -879,10 +732,6 @@ disconnect con4c;
disconnect con5a;
disconnect con5b;
disconnect con5c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con 5a, 5b, 5c, 6a, 6b, 6c disconnected" as status;
status
con 5a, 5b, 5c, 6a, 6b, 6c disconnected
@@ -901,8 +750,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.hosts;
call dump_all();
processlist_user processlist_host
@@ -918,8 +765,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.users;
call dump_all();
processlist_user processlist_host
@@ -934,8 +779,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.accounts;
call dump_all();
processlist_user processlist_host
@@ -950,5 +793,3 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 9
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 9
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead

159
mysql-test/suite/perfschema/r/connection_3u.result
View File

@@ -1,17 +1,3 @@
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
call dump_all();
processlist_user processlist_host
root localhost
@@ -25,12 +11,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con1a, localhost, user1, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user1 in con1a" as status;
status
user1 in con1a
@@ -50,12 +31,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con1b, localhost, user1, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user1 in con1b" as status;
status
user1 in con1b
@@ -76,12 +52,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con1c, localhost, user1, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user1 in con1c" as status;
status
user1 in con1c
@@ -103,12 +74,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 0
<<<<<<< HEAD
connect con2a, localhost, user2, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user2 in con2a" as status;
status
user2 in con2a
@@ -132,12 +98,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 1
<<<<<<< HEAD
connect con2b, localhost, user2, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user2 in con2b" as status;
status
user2 in con2b
@@ -162,12 +123,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 1
<<<<<<< HEAD
connect con2c, localhost, user2, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user2 in con2c" as status;
status
user2 in con2c
@@ -193,12 +149,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 1
<<<<<<< HEAD
connect con3a, localhost, user3, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user3 in con3a" as status;
status
user3 in con3a
@@ -226,12 +177,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 2
<<<<<<< HEAD
connect con3b, localhost, user3, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user3 in con3b" as status;
status
user3 in con3b
@@ -260,12 +206,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 2
<<<<<<< HEAD
connect con3c, localhost, user3, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user3 in con3c" as status;
status
user3 in con3c
@@ -295,13 +236,8 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 2
<<<<<<< HEAD
connection default;
disconnect con1a;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con1a disconnected" as status;
status
con1a disconnected
@@ -330,12 +266,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 2
<<<<<<< HEAD
disconnect con2a;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con2a disconnected" as status;
status
con2a disconnected
@@ -363,12 +294,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 2
<<<<<<< HEAD
disconnect con3a;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con3a disconnected" as status;
status
con3a disconnected
@@ -395,8 +321,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 2
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.accounts;
call dump_all();
processlist_user processlist_host
@@ -421,8 +345,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 2
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.users;
call dump_all();
processlist_user processlist_host
@@ -447,8 +369,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 2
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.hosts;
call dump_all();
processlist_user processlist_host
@@ -473,12 +393,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 2
<<<<<<< HEAD
connect con4a, localhost, user4, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user4 in con4a" as status;
status
user4 in con4a
@@ -507,12 +422,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
<<<<<<< HEAD
connect con4b, localhost, user4, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user4 in con4b" as status;
status
user4 in con4b
@@ -542,12 +452,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
<<<<<<< HEAD
connect con4c, localhost, user4, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user4 in con4c" as status;
status
user4 in con4c
@@ -578,13 +483,8 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
<<<<<<< HEAD
connection default;
disconnect con1b;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con1b disconnected" as status;
status
con1b disconnected
@@ -614,12 +514,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
<<<<<<< HEAD
disconnect con2b;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con2b disconnected" as status;
status
con2b disconnected
@@ -648,12 +543,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
<<<<<<< HEAD
disconnect con3b;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con3b disconnected" as status;
status
con3b disconnected
@@ -681,12 +571,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
<<<<<<< HEAD
disconnect con1c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con1c disconnected" as status;
status
con1c disconnected
@@ -713,12 +598,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
<<<<<<< HEAD
disconnect con2c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con2c disconnected" as status;
status
con2c disconnected
@@ -744,12 +624,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
<<<<<<< HEAD
disconnect con3c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con3c disconnected" as status;
status
con3c disconnected
@@ -774,8 +649,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.accounts;
call dump_all();
processlist_user processlist_host
@@ -795,8 +668,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.users;
call dump_all();
processlist_user processlist_host
@@ -815,8 +686,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.hosts;
call dump_all();
processlist_user processlist_host
@@ -835,12 +704,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
<<<<<<< HEAD
connect con5a, localhost, user5, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user5 in con5a" as status;
status
user5 in con5a
@@ -864,12 +728,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
<<<<<<< HEAD
connect con5b, localhost, user5, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user5 in con5b" as status;
status
user5 in con5b
@@ -894,12 +753,7 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
<<<<<<< HEAD
connect con5c, localhost, user5, , ;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "user5 in con5c" as status;
status
user5 in con5c
@@ -925,7 +779,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
<<<<<<< HEAD
connection default;
disconnect con4a;
disconnect con4b;
@@ -933,10 +786,6 @@ disconnect con4c;
disconnect con5a;
disconnect con5b;
disconnect con5c;
=======
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
>>>>>>> merge-perfschema-5.7
select "con 5a, 5b, 5c, 6a, 6b, 6c disconnected" as status;
status
con 5a, 5b, 5c, 6a, 6b, 6c disconnected
@@ -956,8 +805,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.hosts;
call dump_all();
processlist_user processlist_host
@@ -973,8 +820,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.users;
call dump_all();
processlist_user processlist_host
@@ -989,8 +834,6 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead
truncate table performance_schema.accounts;
call dump_all();
processlist_user processlist_host
@@ -1005,5 +848,3 @@ variable_name variable_value
PERFORMANCE_SCHEMA_ACCOUNTS_LOST 0
PERFORMANCE_SCHEMA_HOSTS_LOST 0
PERFORMANCE_SCHEMA_USERS_LOST 3
Warnings:
Warning 1287 'INFORMATION_SCHEMA.GLOBAL_STATUS' is deprecated and will be removed in a future release. Please use performance_schema.global_status instead

12
mysql-test/suite/perfschema/r/connection_type_notwin.result
View File

@@ -11,7 +11,8 @@ grant select on *.* to 'root'@'santa.claus.ipv4.example.com';
create user 'rootssl'@'santa.claus.ipv4.example.com'
require SSL;
grant select on *.* to 'rootssl'@'santa.claus.ipv4.example.com';
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
set @old_dbug=@@global.debug_dbug;
set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
TRUNCATE TABLE mysql.general_log;
SET @old_log_output= @@global.log_output;
SET @old_general_log= @@global.general_log;
@@ -19,6 +20,7 @@ SET @old_general_log_file= @@global.general_log_file;
SET GLOBAL general_log_file = '.../log/rewrite_general_con.log';
SET GLOBAL log_output = 'FILE,TABLE';
SET GLOBAL general_log= 'ON';
connect con1, localhost, root,,;
"Connection con1"
select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
from performance_schema.threads
@@ -27,6 +29,8 @@ NAME thread/sql/one_connection
PROCESSLIST_USER root
PROCESSLIST_HOST localhost
CONNECTION_TYPE Socket
disconnect con1;
connect con2, "127.0.0.1", root,,test,$MASTER_MYPORT,;
"Connection con2"
select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
from performance_schema.threads
@@ -35,6 +39,8 @@ NAME thread/sql/one_connection
PROCESSLIST_USER root
PROCESSLIST_HOST santa.claus.ipv4.example.com
CONNECTION_TYPE TCP/IP
disconnect con2;
connect con3, "127.0.0.1", rootssl,,test,$MASTER_MYPORT,,SSL;
"Connection con3"
select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
from performance_schema.threads
@@ -43,6 +49,8 @@ NAME thread/sql/one_connection
PROCESSLIST_USER rootssl
PROCESSLIST_HOST santa.claus.ipv4.example.com
CONNECTION_TYPE SSL/TLS
disconnect con3;
connection default;
SET GLOBAL general_log= 'OFF';
CREATE TABLE test_log (argument TEXT);
LOAD DATA LOCAL INFILE '.../log/rewrite_general_con.log'
@@ -67,7 +75,7 @@ DROP TABLE test_log;
SET GLOBAL general_log_file= @old_general_log_file;
SET GLOBAL general_log= @old_general_log;
SET GLOBAL log_output= @old_log_output;
set global debug= default;
set global debug_dbug= @old_dbug;
revoke select on *.* from 'root'@'santa.claus.ipv4.example.com';
drop user 'root'@'santa.claus.ipv4.example.com';
revoke select on *.* from 'rootssl'@'santa.claus.ipv4.example.com';

11
mysql-test/suite/perfschema/r/connection_type_win.result
View File

@@ -11,7 +11,7 @@ grant select on *.* to 'root'@'santa.claus.ipv4.example.com';
create user 'rootssl'@'santa.claus.ipv4.example.com'
require SSL;
grant select on *.* to 'rootssl'@'santa.claus.ipv4.example.com';
set global debug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
set global debug_dbug= "+d,vio_peer_addr_fake_ipv4,getnameinfo_fake_ipv4,getaddrinfo_fake_good_ipv4";
TRUNCATE TABLE mysql.general_log;
SET @old_log_output= @@global.log_output;
SET @old_general_log= @@global.general_log;
@@ -19,6 +19,7 @@ SET @old_general_log_file= @@global.general_log_file;
SET GLOBAL general_log_file = '.../log/rewrite_general_con.log';
SET GLOBAL log_output = 'FILE,TABLE';
SET GLOBAL general_log= 'ON';
connect con1, localhost, root,,;
"Connection con1"
select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
from performance_schema.threads
@@ -27,6 +28,8 @@ NAME thread/sql/one_connection
PROCESSLIST_USER root
PROCESSLIST_HOST santa.claus.ipv4.example.com
CONNECTION_TYPE TCP/IP
disconnect con1;
connect con2, "127.0.0.1", root,,test,$MASTER_MYPORT,;
"Connection con2"
select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
from performance_schema.threads
@@ -35,6 +38,8 @@ NAME thread/sql/one_connection
PROCESSLIST_USER root
PROCESSLIST_HOST santa.claus.ipv4.example.com
CONNECTION_TYPE TCP/IP
disconnect con2;
connect con3, "127.0.0.1", rootssl,,test,$MASTER_MYPORT,,SSL;
"Connection con3"
select NAME, PROCESSLIST_USER, PROCESSLIST_HOST, CONNECTION_TYPE
from performance_schema.threads
@@ -43,6 +48,8 @@ NAME thread/sql/one_connection
PROCESSLIST_USER rootssl
PROCESSLIST_HOST santa.claus.ipv4.example.com
CONNECTION_TYPE SSL/TLS
disconnect con3;
connection default;
SET GLOBAL general_log= 'OFF';
CREATE TABLE test_log (argument TEXT);
LOAD DATA LOCAL INFILE '.../log/rewrite_general_con.log'
@@ -67,7 +74,7 @@ DROP TABLE test_log;
SET GLOBAL general_log_file= @old_general_log_file;
SET GLOBAL general_log= @old_general_log;
SET GLOBAL log_output= @old_log_output;
set global debug= default;
set global debug_dbug= default;
revoke select on *.* from 'root'@'santa.claus.ipv4.example.com';
drop user 'root'@'santa.claus.ipv4.example.com';
revoke select on *.* from 'rootssl'@'santa.claus.ipv4.example.com';

124
mysql-test/suite/perfschema/r/csv_table_io.result
View File

@@ -70,98 +70,51 @@ where event_name like 'wait/io/table/%'
and object_schema in ("test")
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
<<<<<<< HEAD
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
show status where Variable_name like 'performance_schema_%' and
Variable_name not like 'performance_schema_%_classes_lost';
=======
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 3
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 3
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab delete 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
show global status like 'performance_schema_%';
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Variable_name Value
Performance_schema_accounts_lost 0
Performance_schema_cond_classes_lost 0
Performance_schema_cond_instances_lost 0
Performance_schema_digest_lost 0
Performance_schema_file_classes_lost 0
Performance_schema_file_handles_lost 0
Performance_schema_file_instances_lost 0
Performance_schema_hosts_lost 0
Performance_schema_index_stat_lost 0
Performance_schema_locker_lost 0
<<<<<<< HEAD
Performance_schema_mutex_instances_lost 0
=======
Performance_schema_memory_classes_lost 0
Performance_schema_metadata_lock_lost 0
Performance_schema_mutex_classes_lost 0
@@ -170,17 +123,16 @@ Performance_schema_nested_statement_lost 0
Performance_schema_prepared_statements_lost 0
Performance_schema_program_lost 0
Performance_schema_rwlock_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_rwlock_instances_lost 0
Performance_schema_session_connect_attrs_lost 0
Performance_schema_socket_classes_lost 0
Performance_schema_socket_instances_lost 0
Performance_schema_stage_classes_lost 0
Performance_schema_statement_classes_lost 0
Performance_schema_table_handles_lost 0
Performance_schema_table_instances_lost 0
<<<<<<< HEAD
=======
Performance_schema_table_lock_stat_lost 0
Performance_schema_thread_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_thread_instances_lost 0
Performance_schema_users_lost 0
truncate performance_schema.events_waits_history_long;

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

@@ -5,6 +5,6 @@ ALTER TABLE performance_schema.events_stages_current ADD INDEX test_index(EVENT_
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.events_stages_current(EVENT_ID);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT GENERATION_EXPRESSION
def performance_schema events_stages_current WORK_COMPLETED 9 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references
def performance_schema events_stages_current WORK_ESTIMATED 10 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT IS_GENERATED GENERATION_EXPRESSION
def performance_schema events_stages_current WORK_COMPLETED 9 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NEVER NULL
def performance_schema events_stages_current WORK_ESTIMATED 10 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NEVER NULL

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

@@ -5,6 +5,6 @@ ALTER TABLE performance_schema.events_stages_history ADD INDEX test_index(EVENT_
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.events_stages_history(EVENT_ID);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT GENERATION_EXPRESSION
def performance_schema events_stages_history WORK_COMPLETED 9 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references
def performance_schema events_stages_history WORK_ESTIMATED 10 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT IS_GENERATED GENERATION_EXPRESSION
def performance_schema events_stages_history WORK_COMPLETED 9 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NEVER NULL
def performance_schema events_stages_history WORK_ESTIMATED 10 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NEVER NULL

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

@@ -5,6 +5,6 @@ ALTER TABLE performance_schema.events_stages_history_long ADD INDEX test_index(E
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.events_stages_history_long(EVENT_ID);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT GENERATION_EXPRESSION
def performance_schema events_stages_history_long WORK_COMPLETED 9 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references
def performance_schema events_stages_history_long WORK_ESTIMATED 10 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references
TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION COLUMN_DEFAULT IS_NULLABLE DATA_TYPE CHARACTER_MAXIMUM_LENGTH CHARACTER_OCTET_LENGTH NUMERIC_PRECISION NUMERIC_SCALE DATETIME_PRECISION CHARACTER_SET_NAME COLLATION_NAME COLUMN_TYPE COLUMN_KEY EXTRA PRIVILEGES COLUMN_COMMENT IS_GENERATED GENERATION_EXPRESSION
def performance_schema events_stages_history_long WORK_COMPLETED 9 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NEVER NULL
def performance_schema events_stages_history_long WORK_ESTIMATED 10 NULL YES bigint NULL NULL 20 0 NULL NULL NULL bigint(20) unsigned select,insert,update,references NEVER NULL

2
mysql-test/suite/perfschema/r/ddl_global_variables.result
View File

@@ -2,7 +2,7 @@ alter table performance_schema.global_variables
add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.global_variables;
ERROR HY000: Invalid performance_schema usage.
ERROR HY000: Invalid performance_schema usage
ALTER TABLE performance_schema.global_variables
ADD INDEX test_index(VARIABLE_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

2
mysql-test/suite/perfschema/r/ddl_metadata_locks.result
View File

@@ -1,7 +1,7 @@
alter table performance_schema.metadata_locks add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.metadata_locks;
ERROR HY000: Invalid performance_schema usage.
ERROR HY000: Invalid performance_schema usage
ALTER TABLE performance_schema.metadata_locks ADD INDEX test_index(TIMER_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.metadata_locks(TIMER_NAME);

2
mysql-test/suite/perfschema/r/ddl_replication_applier_configuration.result
View File

@@ -2,7 +2,7 @@ ALTER TABLE performance_schema.replication_applier_configuration
ADD COLUMN foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
TRUNCATE TABLE performance_schema.replication_applier_configuration;
ERROR HY000: Invalid performance_schema usage.
ERROR HY000: Invalid performance_schema usage
ALTER TABLE performance_schema.replication_applier_configuration
ADD INDEX test_index(desired_delay);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

2
mysql-test/suite/perfschema/r/ddl_replication_applier_status.result
View File

@@ -2,7 +2,7 @@ ALTER TABLE performance_schema.replication_applier_status
ADD COLUMN foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
TRUNCATE TABLE performance_schema.replication_applier_status;
ERROR HY000: Invalid performance_schema usage.
ERROR HY000: Invalid performance_schema usage
ALTER TABLE performance_schema.replication_applier_status
ADD INDEX test_index(remaining_delay);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

2
mysql-test/suite/perfschema/r/ddl_replication_applier_status_by_coordinator.result
View File

@@ -2,7 +2,7 @@ ALTER TABLE performance_schema.replication_applier_status_by_coordinator
ADD COLUMN foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
TRUNCATE TABLE performance_schema.replication_applier_status_by_coordinator;
ERROR HY000: Invalid performance_schema usage.
ERROR HY000: Invalid performance_schema usage
ALTER TABLE performance_schema.replication_applier_status_by_coordinator
ADD INDEX test_index(thread_id);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

2
mysql-test/suite/perfschema/r/ddl_replication_connection_configuration.result
View File

@@ -2,7 +2,7 @@ ALTER TABLE performance_schema.replication_connection_configuration
ADD COLUMN foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
TRUNCATE TABLE performance_schema.replication_connection_configuration;
ERROR HY000: Invalid performance_schema usage.
ERROR HY000: Invalid performance_schema usage
ALTER TABLE performance_schema.replication_connection_configuration
ADD INDEX test_index(HOST);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

2
mysql-test/suite/perfschema/r/ddl_session_status.result
View File

@@ -2,7 +2,7 @@ alter table performance_schema.session_status
add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.session_status;
ERROR HY000: Invalid performance_schema usage.
ERROR HY000: Invalid performance_schema usage
ALTER TABLE performance_schema.session_status
ADD INDEX test_index(VARIABLE_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

2
mysql-test/suite/perfschema/r/ddl_session_variables.result
View File

@@ -2,7 +2,7 @@ alter table performance_schema.session_variables
add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.session_variables;
ERROR HY000: Invalid performance_schema usage.
ERROR HY000: Invalid performance_schema usage
ALTER TABLE performance_schema.session_variables
ADD INDEX test_index(VARIABLE_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

2
mysql-test/suite/perfschema/r/ddl_table_handles.result
View File

@@ -1,7 +1,7 @@
alter table performance_schema.table_handles add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.table_handles;
ERROR HY000: Invalid performance_schema usage.
ERROR HY000: Invalid performance_schema usage
ALTER TABLE performance_schema.table_handles ADD INDEX test_index(TIMER_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE UNIQUE INDEX test_index ON performance_schema.table_handles(TIMER_NAME);

2
mysql-test/suite/perfschema/r/ddl_uvar_by_thread.result
View File

@@ -2,7 +2,7 @@ alter table performance_schema.user_variables_by_thread
add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.user_variables_by_thread;
ERROR HY000: Invalid performance_schema usage.
ERROR HY000: Invalid performance_schema usage
ALTER TABLE performance_schema.user_variables_by_thread
ADD INDEX test_index(VARIABLE_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

2
mysql-test/suite/perfschema/r/ddl_variables_by_thread.result
View File

@@ -2,7 +2,7 @@ alter table performance_schema.variables_by_thread
add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.variables_by_thread;
ERROR HY000: Invalid performance_schema usage.
ERROR HY000: Invalid performance_schema usage
ALTER TABLE performance_schema.variables_by_thread
ADD INDEX test_index(VARIABLE_NAME);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'

7
mysql-test/suite/perfschema/r/digest_table_full.result
View File

@@ -111,17 +111,10 @@ DROP TRIGGER trg;
####################################
SELECT SCHEMA_NAME, DIGEST_TEXT, COUNT_STAR, SUM_ROWS_AFFECTED, SUM_WARNINGS,
SUM_ERRORS FROM performance_schema.events_statements_summary_by_digest;
<<<<<<< HEAD
SCHEMA_NAME DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS
NULL NULL 55 32 1 2
statements_digest TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 0 0 0
SHOW VARIABLES LIKE "performance_schema_digests_size";
=======
SCHEMA_NAME DIGEST DIGEST_TEXT COUNT_STAR SUM_ROWS_AFFECTED SUM_WARNINGS SUM_ERRORS
NULL NULL NULL 55 32 1 2
statements_digest d24da32343f2b799f8a7ba1bdc45f83b TRUNCATE TABLE `performance_schema` . `events_statements_summary_by_digest` 1 0 0 0
SHOW GLOBAL VARIABLES LIKE "performance_schema_digests_size";
>>>>>>> merge-perfschema-5.7
Variable_name Value
performance_schema_digests_size 2
SELECT COUNT(*) FROM performance_schema.events_statements_summary_by_digest;

320
mysql-test/suite/perfschema/r/dml_handler.result
View File

@@ -12,328 +12,198 @@ Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be
# For each table in the performance schema, attempt HANDLER...OPEN,
# which should fail with an error 1031, ER_ILLEGAL_HA.
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=87;
HANDLER performance_schema.variables_by_thread OPEN;
ERROR HY000: Table storage engine for 'variables_by_thread' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=86;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=80;
HANDLER performance_schema.user_variables_by_thread OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`user_variables_by_thread` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=79;
HANDLER performance_schema.users OPEN;
<<<<<<< HEAD
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`users` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=51;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=78;
HANDLER performance_schema.threads OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`threads` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=50;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=77;
HANDLER performance_schema.table_lock_waits_summary_by_table OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_lock_waits_summary_by_table` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=49;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=76;
HANDLER performance_schema.table_io_waits_summary_by_table OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_io_waits_summary_by_table` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=48;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=75;
HANDLER performance_schema.table_io_waits_summary_by_index_usage OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_io_waits_summary_by_index_usage` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=47;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=74;
HANDLER performance_schema.table_handles OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`table_handles` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=73;
HANDLER performance_schema.status_by_user OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`status_by_user` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=72;
HANDLER performance_schema.status_by_thread OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`status_by_thread` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=71;
HANDLER performance_schema.status_by_host OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`status_by_host` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=70;
HANDLER performance_schema.status_by_account OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`status_by_account` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=69;
HANDLER performance_schema.socket_summary_by_instance OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_summary_by_instance` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=46;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=68;
HANDLER performance_schema.socket_summary_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_summary_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=45;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=67;
HANDLER performance_schema.socket_instances OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`socket_instances` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=44;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=66;
HANDLER performance_schema.setup_timers OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_timers` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=43;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=65;
HANDLER performance_schema.setup_objects OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_objects` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=42;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=64;
HANDLER performance_schema.setup_instruments OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_instruments` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=41;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=63;
HANDLER performance_schema.setup_consumers OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_consumers` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=40;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=62;
HANDLER performance_schema.setup_actors OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`setup_actors` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=39;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=61;
HANDLER performance_schema.session_status OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`session_status` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=60;
HANDLER performance_schema.session_connect_attrs OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`session_connect_attrs` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=38;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=59;
HANDLER performance_schema.session_account_connect_attrs OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`session_account_connect_attrs` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=37;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=58;
HANDLER performance_schema.rwlock_instances OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`rwlock_instances` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=36;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=57;
HANDLER performance_schema.replication_connection_configuration OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`replication_connection_configuration` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=56;
HANDLER performance_schema.replication_applier_status_by_coordinator OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`replication_applier_status_by_coordinator` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=55;
HANDLER performance_schema.replication_applier_status OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`replication_applier_status` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=54;
HANDLER performance_schema.replication_applier_configuration OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`replication_applier_configuration` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=53;
HANDLER performance_schema.prepared_statements_instances OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`prepared_statements_instances` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=52;
HANDLER performance_schema.performance_timers OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`performance_timers` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=35;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=51;
HANDLER performance_schema.objects_summary_global_by_type OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`objects_summary_global_by_type` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=34;
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=50;
HANDLER performance_schema.mutex_instances OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`mutex_instances` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=33;
HANDLER performance_schema.host_cache OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`host_cache` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=32;
HANDLER performance_schema.hosts OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`hosts` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=31;
HANDLER performance_schema.file_summary_by_instance OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_summary_by_instance` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=30;
HANDLER performance_schema.file_summary_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_summary_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=29;
HANDLER performance_schema.file_instances OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_instances` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=28;
HANDLER performance_schema.events_waits_summary_global_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_global_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=27;
HANDLER performance_schema.events_waits_summary_by_user_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_user_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=26;
HANDLER performance_schema.events_waits_summary_by_thread_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_thread_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=25;
HANDLER performance_schema.events_waits_summary_by_instance OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_instance` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=24;
HANDLER performance_schema.events_waits_summary_by_host_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_host_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=23;
HANDLER performance_schema.events_waits_summary_by_account_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_account_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=22;
HANDLER performance_schema.events_waits_history_long OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_history_long` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=21;
HANDLER performance_schema.events_waits_history OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_history` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=20;
HANDLER performance_schema.events_waits_current OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_current` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=19;
HANDLER performance_schema.events_statements_summary_global_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_global_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=18;
HANDLER performance_schema.events_statements_summary_by_user_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_user_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=17;
HANDLER performance_schema.events_statements_summary_by_thread_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_thread_by_event_name` doesn't have this option
=======
ERROR HY000: Table storage engine for 'users' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=85;
HANDLER performance_schema.user_variables_by_thread OPEN;
ERROR HY000: Table storage engine for 'user_variables_by_thread' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=84;
HANDLER performance_schema.threads OPEN;
ERROR HY000: Table storage engine for 'threads' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=83;
HANDLER performance_schema.table_lock_waits_summary_by_table OPEN;
ERROR HY000: Table storage engine for 'table_lock_waits_summary_by_table' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=82;
HANDLER performance_schema.table_io_waits_summary_by_table OPEN;
ERROR HY000: Table storage engine for 'table_io_waits_summary_by_table' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=81;
HANDLER performance_schema.table_io_waits_summary_by_index_usage OPEN;
ERROR HY000: Table storage engine for 'table_io_waits_summary_by_index_usage' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=80;
HANDLER performance_schema.table_handles OPEN;
ERROR HY000: Table storage engine for 'table_handles' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=79;
HANDLER performance_schema.status_by_user OPEN;
ERROR HY000: Table storage engine for 'status_by_user' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=78;
HANDLER performance_schema.status_by_thread OPEN;
ERROR HY000: Table storage engine for 'status_by_thread' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=77;
HANDLER performance_schema.status_by_host OPEN;
ERROR HY000: Table storage engine for 'status_by_host' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=76;
HANDLER performance_schema.status_by_account OPEN;
ERROR HY000: Table storage engine for 'status_by_account' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=75;
HANDLER performance_schema.socket_summary_by_instance OPEN;
ERROR HY000: Table storage engine for 'socket_summary_by_instance' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=74;
HANDLER performance_schema.socket_summary_by_event_name OPEN;
ERROR HY000: Table storage engine for 'socket_summary_by_event_name' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=73;
HANDLER performance_schema.socket_instances OPEN;
ERROR HY000: Table storage engine for 'socket_instances' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=72;
HANDLER performance_schema.setup_timers OPEN;
ERROR HY000: Table storage engine for 'setup_timers' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=71;
HANDLER performance_schema.setup_objects OPEN;
ERROR HY000: Table storage engine for 'setup_objects' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=70;
HANDLER performance_schema.setup_instruments OPEN;
ERROR HY000: Table storage engine for 'setup_instruments' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=69;
HANDLER performance_schema.setup_consumers OPEN;
ERROR HY000: Table storage engine for 'setup_consumers' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=68;
HANDLER performance_schema.setup_actors OPEN;
ERROR HY000: Table storage engine for 'setup_actors' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=67;
HANDLER performance_schema.session_variables OPEN;
ERROR HY000: Table storage engine for 'session_variables' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=66;
HANDLER performance_schema.session_status OPEN;
ERROR HY000: Table storage engine for 'session_status' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=65;
HANDLER performance_schema.session_connect_attrs OPEN;
ERROR HY000: Table storage engine for 'session_connect_attrs' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=64;
HANDLER performance_schema.session_account_connect_attrs OPEN;
ERROR HY000: Table storage engine for 'session_account_connect_attrs' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=63;
HANDLER performance_schema.rwlock_instances OPEN;
ERROR HY000: Table storage engine for 'rwlock_instances' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=62;
HANDLER performance_schema.replication_group_members OPEN;
ERROR HY000: Table storage engine for 'replication_group_members' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=61;
HANDLER performance_schema.replication_group_member_stats OPEN;
ERROR HY000: Table storage engine for 'replication_group_member_stats' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=60;
HANDLER performance_schema.replication_connection_status OPEN;
ERROR HY000: Table storage engine for 'replication_connection_status' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=59;
HANDLER performance_schema.replication_connection_configuration OPEN;
ERROR HY000: Table storage engine for 'replication_connection_configuration' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=58;
HANDLER performance_schema.replication_applier_status_by_worker OPEN;
ERROR HY000: Table storage engine for 'replication_applier_status_by_worker' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=57;
HANDLER performance_schema.replication_applier_status_by_coordinator OPEN;
ERROR HY000: Table storage engine for 'replication_applier_status_by_coordinator' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=56;
HANDLER performance_schema.replication_applier_status OPEN;
ERROR HY000: Table storage engine for 'replication_applier_status' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=55;
HANDLER performance_schema.replication_applier_configuration OPEN;
ERROR HY000: Table storage engine for 'replication_applier_configuration' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=54;
HANDLER performance_schema.prepared_statements_instances OPEN;
ERROR HY000: Table storage engine for 'prepared_statements_instances' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=53;
HANDLER performance_schema.performance_timers OPEN;
ERROR HY000: Table storage engine for 'performance_timers' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=52;
HANDLER performance_schema.objects_summary_global_by_type OPEN;
ERROR HY000: Table storage engine for 'objects_summary_global_by_type' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=51;
HANDLER performance_schema.mutex_instances OPEN;
ERROR HY000: Table storage engine for 'mutex_instances' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=50;
HANDLER performance_schema.metadata_locks OPEN;
ERROR HY000: Table storage engine for 'metadata_locks' doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=49;
HANDLER performance_schema.memory_summary_global_by_event_name OPEN;
ERROR HY000: Table storage engine for 'memory_summary_global_by_event_name' doesn't have this option
HANDLER performance_schema.metadata_locks OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`metadata_locks` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=48;
HANDLER performance_schema.memory_summary_by_user_by_event_name OPEN;
ERROR HY000: Table storage engine for 'memory_summary_by_user_by_event_name' doesn't have this option
HANDLER performance_schema.memory_summary_global_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`memory_summary_global_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=47;
HANDLER performance_schema.memory_summary_by_thread_by_event_name OPEN;
ERROR HY000: Table storage engine for 'memory_summary_by_thread_by_event_name' doesn't have this option
HANDLER performance_schema.memory_summary_by_user_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`memory_summary_by_user_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=46;
HANDLER performance_schema.memory_summary_by_host_by_event_name OPEN;
ERROR HY000: Table storage engine for 'memory_summary_by_host_by_event_name' doesn't have this option
HANDLER performance_schema.memory_summary_by_thread_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`memory_summary_by_thread_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=45;
HANDLER performance_schema.memory_summary_by_account_by_event_name OPEN;
ERROR HY000: Table storage engine for 'memory_summary_by_account_by_event_name' doesn't have this option
HANDLER performance_schema.memory_summary_by_host_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`memory_summary_by_host_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=44;
HANDLER performance_schema.hosts OPEN;
ERROR HY000: Table storage engine for 'hosts' doesn't have this option
HANDLER performance_schema.memory_summary_by_account_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`memory_summary_by_account_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=43;
HANDLER performance_schema.host_cache OPEN;
ERROR HY000: Table storage engine for 'host_cache' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`host_cache` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=42;
HANDLER performance_schema.global_variables OPEN;
ERROR HY000: Table storage engine for 'global_variables' doesn't have this option
HANDLER performance_schema.hosts OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`hosts` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=41;
HANDLER performance_schema.global_status OPEN;
ERROR HY000: Table storage engine for 'global_status' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`global_status` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=40;
HANDLER performance_schema.file_summary_by_instance OPEN;
ERROR HY000: Table storage engine for 'file_summary_by_instance' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_summary_by_instance` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=39;
HANDLER performance_schema.file_summary_by_event_name OPEN;
ERROR HY000: Table storage engine for 'file_summary_by_event_name' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_summary_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=38;
HANDLER performance_schema.file_instances OPEN;
ERROR HY000: Table storage engine for 'file_instances' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`file_instances` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=37;
HANDLER performance_schema.events_waits_summary_global_by_event_name OPEN;
ERROR HY000: Table storage engine for 'events_waits_summary_global_by_event_name' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_global_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=36;
HANDLER performance_schema.events_waits_summary_by_user_by_event_name OPEN;
ERROR HY000: Table storage engine for 'events_waits_summary_by_user_by_event_name' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_user_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=35;
HANDLER performance_schema.events_waits_summary_by_thread_by_event_name OPEN;
ERROR HY000: Table storage engine for 'events_waits_summary_by_thread_by_event_name' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_thread_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=34;
HANDLER performance_schema.events_waits_summary_by_instance OPEN;
ERROR HY000: Table storage engine for 'events_waits_summary_by_instance' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_instance` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=33;
HANDLER performance_schema.events_waits_summary_by_host_by_event_name OPEN;
ERROR HY000: Table storage engine for 'events_waits_summary_by_host_by_event_name' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_host_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=32;
HANDLER performance_schema.events_waits_summary_by_account_by_event_name OPEN;
ERROR HY000: Table storage engine for 'events_waits_summary_by_account_by_event_name' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_summary_by_account_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=31;
HANDLER performance_schema.events_waits_history_long OPEN;
ERROR HY000: Table storage engine for 'events_waits_history_long' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_history_long` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=30;
HANDLER performance_schema.events_waits_history OPEN;
ERROR HY000: Table storage engine for 'events_waits_history' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_history` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=29;
HANDLER performance_schema.events_waits_current OPEN;
ERROR HY000: Table storage engine for 'events_waits_current' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_waits_current` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=28;
HANDLER performance_schema.events_transactions_summary_global_by_event_name OPEN;
ERROR HY000: Table storage engine for 'events_transactions_summary_global_by_event_name' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_summary_global_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=27;
HANDLER performance_schema.events_transactions_summary_by_user_by_event_name OPEN;
ERROR HY000: Table storage engine for 'events_transactions_summary_by_user_by_event_name' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_summary_by_user_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=26;
HANDLER performance_schema.events_transactions_summary_by_thread_by_event_name OPEN;
ERROR HY000: Table storage engine for 'events_transactions_summary_by_thread_by_event_name' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_summary_by_thread_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=25;
HANDLER performance_schema.events_transactions_summary_by_host_by_event_name OPEN;
ERROR HY000: Table storage engine for 'events_transactions_summary_by_host_by_event_name' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_summary_by_host_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=24;
HANDLER performance_schema.events_transactions_summary_by_account_by_event_name OPEN;
ERROR HY000: Table storage engine for 'events_transactions_summary_by_account_by_event_name' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_summary_by_account_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=23;
HANDLER performance_schema.events_transactions_history_long OPEN;
ERROR HY000: Table storage engine for 'events_transactions_history_long' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_history_long` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=22;
HANDLER performance_schema.events_transactions_history OPEN;
ERROR HY000: Table storage engine for 'events_transactions_history' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_history` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=21;
HANDLER performance_schema.events_transactions_current OPEN;
ERROR HY000: Table storage engine for 'events_transactions_current' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_transactions_current` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=20;
HANDLER performance_schema.events_statements_summary_global_by_event_name OPEN;
ERROR HY000: Table storage engine for 'events_statements_summary_global_by_event_name' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_global_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=19;
HANDLER performance_schema.events_statements_summary_by_user_by_event_name OPEN;
ERROR HY000: Table storage engine for 'events_statements_summary_by_user_by_event_name' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_user_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=18;
HANDLER performance_schema.events_statements_summary_by_thread_by_event_name OPEN;
ERROR HY000: Table storage engine for 'events_statements_summary_by_thread_by_event_name' doesn't have this option
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_thread_by_event_name` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=17;
HANDLER performance_schema.events_statements_summary_by_program OPEN;
ERROR HY000: Table storage engine for 'events_statements_summary_by_program' doesn't have this option
>>>>>>> merge-perfschema-5.7
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_program` doesn't have this option
SELECT TABLE_NAME INTO @table_name FROM table_list WHERE id=16;
HANDLER performance_schema.events_statements_summary_by_host_by_event_name OPEN;
ERROR HY000: Storage engine PERFORMANCE_SCHEMA of the table `performance_schema`.`events_statements_summary_by_host_by_event_name` doesn't have this option

4
mysql-test/suite/perfschema/r/dml_setup_actors.result
View File

@@ -42,10 +42,7 @@ set host='ILLEGAL';
ERROR HY000: Invalid performance_schema usage
update performance_schema.setup_actors
set role='ILLEGAL';
<<<<<<< HEAD
ERROR HY000: Invalid performance_schema usage
=======
ERROR HY000: Invalid performance_schema usage.
update performance_schema.setup_actors
set ENABLED='YES';
update performance_schema.setup_actors
@@ -71,7 +68,6 @@ ERROR 01000: Data truncated for column 'HISTORY' at row 1
update performance_schema.setup_actors
set HISTORY=NULL;
ERROR 23000: Column 'HISTORY' cannot be null
>>>>>>> 258e16fa2de... WIP 5.7 P_S
select * from performance_schema.setup_actors
order by USER, HOST;
HOST USER ROLE ENABLED HISTORY

62
mysql-test/suite/perfschema/r/dml_setup_instruments.result
View File

@@ -4,35 +4,16 @@ where name like 'Wait/Synch/Mutex/sql/%'
and name not in ('wait/synch/mutex/sql/DEBUG_SYNC::mutex')
order by name limit 10;
NAME ENABLED TIMED
<<<<<<< HEAD
wait/synch/mutex/sql/Ack_receiver::mutex YES YES
wait/synch/mutex/sql/Cversion_lock YES YES
wait/synch/mutex/sql/Delayed_insert::mutex YES YES
=======
wait/synch/mutex/sql/Commit_order_manager::m_mutex YES YES
wait/synch/mutex/sql/Cost_constant_cache::LOCK_cost_const YES YES
>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/mutex/sql/Event_scheduler::LOCK_scheduler_state YES YES
<<<<<<< HEAD
wait/synch/mutex/sql/gtid_waiting::LOCK_gtid_waiting YES YES
wait/synch/mutex/sql/hash_filo::lock YES YES
wait/synch/mutex/sql/HA_DATA_PARTITION::LOCK_auto_inc YES YES
wait/synch/mutex/sql/LOCK_active_mi YES YES
wait/synch/mutex/sql/LOCK_after_binlog_sync YES YES
wait/synch/mutex/sql/LOCK_audit_mask YES YES
<<<<<<< HEAD
=======
wait/synch/mutex/sql/LOCK_binlog_state YES YES
=======
wait/synch/mutex/sql/Gtid_set::gtid_executed::free_intervals_mutex YES YES
wait/synch/mutex/sql/Gtid_state YES YES
wait/synch/mutex/sql/hash_filo::lock YES YES
wait/synch/mutex/sql/key_mts_gaq_LOCK YES YES
wait/synch/mutex/sql/key_mts_temp_table_LOCK YES YES
wait/synch/mutex/sql/LOCK_audit_mask YES YES
wait/synch/mutex/sql/LOCK_compress_gtid_table YES YES
>>>>>>> merge-perfschema-5.7
>>>>>>> 258e16fa2de... WIP 5.7 P_S
select * from performance_schema.setup_instruments
where name like 'Wait/Synch/Rwlock/sql/%'
and name not in (
@@ -40,11 +21,7 @@ where name like 'Wait/Synch/Rwlock/sql/%'
'wait/synch/rwlock/sql/LOCK_named_pipe_full_access_group')
order by name limit 10;
NAME ENABLED TIMED
<<<<<<< HEAD
wait/synch/rwlock/sql/LOCK_all_status_vars YES YES
=======
<<<<<<< HEAD
>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/rwlock/sql/LOCK_dboptions YES YES
wait/synch/rwlock/sql/LOCK_grant YES YES
wait/synch/rwlock/sql/LOCK_SEQUENCE YES YES
@@ -54,24 +31,6 @@ wait/synch/rwlock/sql/LOCK_sys_init_connect YES YES
wait/synch/rwlock/sql/LOCK_sys_init_slave YES YES
wait/synch/rwlock/sql/LOGGER::LOCK_logger YES YES
wait/synch/rwlock/sql/MDL_context::LOCK_waiting_for YES YES
<<<<<<< HEAD
=======
wait/synch/rwlock/sql/MDL_lock::rwlock YES YES
wait/synch/rwlock/sql/Query_cache_query::lock YES YES
wait/synch/rwlock/sql/THR_LOCK_servers YES YES
=======
wait/synch/rwlock/sql/Binlog_relay_IO_delegate::lock YES YES
wait/synch/rwlock/sql/Binlog_storage_delegate::lock YES YES
wait/synch/rwlock/sql/Binlog_transmit_delegate::lock YES YES
wait/synch/rwlock/sql/channel_lock YES YES
wait/synch/rwlock/sql/channel_map_lock YES YES
wait/synch/rwlock/sql/gtid_commit_rollback YES YES
wait/synch/rwlock/sql/gtid_mode_lock YES YES
wait/synch/rwlock/sql/LOCK_dboptions YES YES
wait/synch/rwlock/sql/LOCK_grant YES YES
wait/synch/rwlock/sql/LOCK_system_variables_hash YES YES
>>>>>>> merge-perfschema-5.7
>>>>>>> 258e16fa2de... WIP 5.7 P_S
select * from performance_schema.setup_instruments
where name like 'Wait/Synch/Cond/sql/%'
and name not in (
@@ -82,17 +41,8 @@ where name like 'Wait/Synch/Cond/sql/%'
'wait/synch/cond/sql/COND_start_signal_handler')
order by name limit 10;
NAME ENABLED TIMED
<<<<<<< HEAD
wait/synch/cond/sql/Ack_receiver::cond YES YES
wait/synch/cond/sql/COND_binlog_send YES YES
=======
<<<<<<< HEAD
=======
wait/synch/cond/sql/Commit_order_manager::m_workers.cond YES YES
wait/synch/cond/sql/COND_compress_gtid_table YES YES
wait/synch/cond/sql/COND_connection_count YES YES
>>>>>>> merge-perfschema-5.7
>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/synch/cond/sql/COND_flush_thread_cache YES YES
wait/synch/cond/sql/COND_group_commit_orderer YES YES
wait/synch/cond/sql/COND_gtid_ignore_duplicates YES YES
@@ -100,19 +50,7 @@ wait/synch/cond/sql/COND_manager YES YES
wait/synch/cond/sql/COND_parallel_entry YES YES
wait/synch/cond/sql/COND_prepare_ordered YES YES
wait/synch/cond/sql/COND_queue_state YES YES
<<<<<<< HEAD
wait/synch/cond/sql/COND_rpl_thread YES YES
<<<<<<< HEAD
=======
wait/synch/cond/sql/COND_rpl_thread_pool YES YES
wait/synch/cond/sql/COND_rpl_thread_queue YES YES
=======
wait/synch/cond/sql/COND_server_started YES YES
wait/synch/cond/sql/COND_thd_list YES YES
wait/synch/cond/sql/COND_thread_cache YES YES
wait/synch/cond/sql/COND_thr_lock YES YES
>>>>>>> merge-perfschema-5.7
>>>>>>> 258e16fa2de... WIP 5.7 P_S
select * from performance_schema.setup_instruments
where name='Wait';
select * from performance_schema.setup_instruments

2
mysql-test/suite/perfschema/r/dml_setup_objects.result
View File

@@ -1,7 +1,5 @@
drop table if exists test.setup_objects;
SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
create table test.setup_objects as
select * from performance_schema.setup_objects;
truncate table performance_schema.setup_objects;

34
mysql-test/suite/perfschema/r/dml_setup_timers.result
View File

@@ -1,23 +1,23 @@
update performance_schema.setup_timers
set timer_name='CYCLE' where name="wait";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
update performance_schema.setup_timers
set timer_name='NANOSECOND' where name="stage";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
update performance_schema.setup_timers
set timer_name='NANOSECOND' where name="statement";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
update performance_schema.setup_timers
set timer_name='MICROSECOND' where name="transaction";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
update performance_schema.setup_timers
set timer_name='MICROSECOND' where name="idle";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
select * from performance_schema.setup_timers;
NAME TIMER_NAME
idle MICROSECOND
@@ -26,19 +26,19 @@ stage NANOSECOND
statement NANOSECOND
transaction MICROSECOND
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
select * from performance_schema.setup_timers
where name='Wait';
NAME TIMER_NAME
wait CYCLE
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
select * from performance_schema.setup_timers
where timer_name='CYCLE';
NAME TIMER_NAME
wait CYCLE
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
insert into performance_schema.setup_timers
set name='FOO', timer_name='CYCLE';
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'setup_timers'
@@ -48,7 +48,7 @@ ERROR HY000: Invalid performance_schema usage
update performance_schema.setup_timers
set timer_name='MILLISECOND';
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
select * from performance_schema.setup_timers;
NAME TIMER_NAME
idle MILLISECOND
@@ -57,11 +57,11 @@ stage MILLISECOND
statement MILLISECOND
transaction MILLISECOND
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
update performance_schema.setup_timers
set timer_name='CYCLE';
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
delete from performance_schema.setup_timers;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'setup_timers'
delete from performance_schema.setup_timers
@@ -74,23 +74,23 @@ UNLOCK TABLES;
update performance_schema.setup_timers
set timer_name='CYCLE' where name="wait";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
update performance_schema.setup_timers
set timer_name='NANOSECOND' where name="stage";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
update performance_schema.setup_timers
set timer_name='NANOSECOND' where name="statement";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
update performance_schema.setup_timers
set timer_name='MICROSECOND' where name="transaction";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
update performance_schema.setup_timers
set timer_name='MICROSECOND' where name="idle";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
select * from performance_schema.setup_timers;
NAME TIMER_NAME
idle MICROSECOND
@@ -99,4 +99,4 @@ stage NANOSECOND
statement NANOSECOND
transaction MICROSECOND
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release

5265
mysql-test/suite/perfschema/r/event_aggregate.result
View File

File diff suppressed because it is too large Load Diff

3795
mysql-test/suite/perfschema/r/event_aggregate_no_a.result
View File

File diff suppressed because it is too large Load Diff

3210
mysql-test/suite/perfschema/r/event_aggregate_no_a_no_h.result
View File

File diff suppressed because it is too large Load Diff

2255
mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u.result
View File

File diff suppressed because it is too large Load Diff

1655
mysql-test/suite/perfschema/r/event_aggregate_no_a_no_u_no_h.result
View File

File diff suppressed because it is too large Load Diff

4681
mysql-test/suite/perfschema/r/event_aggregate_no_h.result
View File

File diff suppressed because it is too large Load Diff

3737
mysql-test/suite/perfschema/r/event_aggregate_no_u.result
View File

File diff suppressed because it is too large Load Diff

3137
mysql-test/suite/perfschema/r/event_aggregate_no_u_no_h.result
View File

File diff suppressed because it is too large Load Diff

12
mysql-test/suite/perfschema/r/global_read_lock.result
View File

@@ -1,19 +1,7 @@
use performance_schema;
update performance_schema.setup_instruments set enabled='YES';
<<<<<<< HEAD
create user pfsuser@localhost;
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
grant SELECT, UPDATE, LOCK TABLES on performance_schema.* to pfsuser@localhost;
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
flush privileges;
connect con1, localhost, pfsuser, , test;
lock tables performance_schema.setup_instruments read;

13
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_again_allow.result
View File

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
<<<<<<< HEAD
create user 'root'@'192.0.2.4';
grant select on test.* to 'root'@'192.0.2.4';
connect con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
grant select on test.* to 'root'@'192.0.2.4';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive

13
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_bad_allow.result
View File

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
<<<<<<< HEAD
create user 'root'@'192.0.2.4';
grant select on test.* to 'root'@'192.0.2.4';
connect con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
grant select on test.* to 'root'@'192.0.2.4';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive

13
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_good_allow.result
View File

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
<<<<<<< HEAD
create user 'root'@'santa.claus.ipv4.example.com';
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
connect con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive

16
mysql-test/suite/perfschema/r/hostcache_ipv4_addrinfo_noname_allow.result
View File

@@ -11,27 +11,11 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
<<<<<<< HEAD
create user 'root'@'santa.claus.ipv4.example.com';
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
create user 'root'@'192.0.2.4';
grant select on test.* to 'root'@'192.0.2.4';
connect con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
grant select on test.* to 'root'@'192.0.2.4';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive

12
mysql-test/suite/perfschema/r/hostcache_ipv4_blocked.result
View File

@@ -12,20 +12,8 @@ select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
select @@global.max_connect_errors into @saved_max_connect_errors;
set global max_connect_errors = 3;
<<<<<<< HEAD
create user 'root'@'santa.claus.ipv4.example.com';
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
create user 'quota'@'santa.claus.ipv4.example.com';
grant select on test.* to 'quota'@'santa.claus.ipv4.example.com';
connect con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;

11
mysql-test/suite/perfschema/r/hostcache_ipv4_max_con.result
View File

@@ -16,12 +16,7 @@ create user 'quota'@'santa.claus.ipv4.example.com';
grant select on test.* to 'quota'@'santa.claus.ipv4.example.com';
grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
with max_connections_per_hour 3;
<<<<<<< HEAD
connect con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
=======
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive
@@ -205,12 +200,8 @@ FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set
grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
with max_connections_per_hour 0;
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
with max_user_connections 3;
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
flush user_resources;
connect con3a,"127.0.0.1",quota,,test,$MASTER_MYPORT,;
select "Con7 is alive";
@@ -385,8 +376,6 @@ disconnect con3b;
disconnect con3c;
grant usage on *.* to 'quota'@'santa.claus.ipv4.example.com'
with max_user_connections 0;
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
flush user_resources;
set global max_user_connections = 3;
connect con4a,"127.0.0.1",quota,,test,$MASTER_MYPORT,;

16
mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_again_allow.result
View File

@@ -11,27 +11,11 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
<<<<<<< HEAD
create user 'root'@'192.0.2.4';
grant select on test.* to 'root'@'192.0.2.4';
create user 'root'@'santa.claus.ipv4.example.com';
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
connect con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
grant select on test.* to 'root'@'192.0.2.4';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
grant select on test.* to 'root'@'santa.claus.ipv4.example.com';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive

13
mysql-test/suite/perfschema/r/hostcache_ipv4_nameinfo_noname_allow.result
View File

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
<<<<<<< HEAD
create user 'root'@'192.0.2.4';
grant select on test.* to 'root'@'192.0.2.4';
connect con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
grant select on test.* to 'root'@'192.0.2.4';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive

7
mysql-test/suite/perfschema/r/hostcache_ipv4_ssl.result
View File

@@ -15,18 +15,11 @@ create user 'user_ssl_x509'@'santa.claus.ipv4.example.com'
identified by 'good_password';
grant select on test.* to 'user_ssl'@'santa.claus.ipv4.example.com'
REQUIRE SSL;
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
grant select on test.* to 'user_ssl_x509'@'santa.claus.ipv4.example.com'
REQUIRE SUBJECT '/C=??/ST=??/L=??/
O=No such thing/
CN=Santa Claus/emailAddress=santa.claus@example.com';
<<<<<<< HEAD
connect con1,"127.0.0.1",root,,test,$MASTER_MYPORT,;
=======
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive

13
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_again_allow.result
View File

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
<<<<<<< HEAD
create user 'root'@'2001:db8::6:6';
grant select on test.* to 'root'@'2001:db8::6:6';
connect con1,"::1",root,,test,$MASTER_MYPORT,;
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
grant select on test.* to 'root'@'2001:db8::6:6';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive

13
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_bad_allow.result
View File

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
<<<<<<< HEAD
create user 'root'@'2001:db8::6:6';
grant select on test.* to 'root'@'2001:db8::6:6';
connect con1,"::1",root,,test,$MASTER_MYPORT,;
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
grant select on test.* to 'root'@'2001:db8::6:6';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive

13
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_good_allow.result
View File

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
<<<<<<< HEAD
create user 'root'@'santa.claus.ipv6.example.com';
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
connect con1,"::1",root,,test,$MASTER_MYPORT,;
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive

16
mysql-test/suite/perfschema/r/hostcache_ipv6_addrinfo_noname_allow.result
View File

@@ -11,27 +11,11 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
<<<<<<< HEAD
create user 'root'@'santa.claus.ipv6.example.com';
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
create user 'root'@'2001:db8::6:6';
grant select on test.* to 'root'@'2001:db8::6:6';
connect con1,"::1",root,,test,$MASTER_MYPORT,;
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
grant select on test.* to 'root'@'2001:db8::6:6';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive

12
mysql-test/suite/perfschema/r/hostcache_ipv6_blocked.result
View File

@@ -12,20 +12,8 @@ select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
select @@global.max_connect_errors into @saved_max_connect_errors;
set global max_connect_errors = 3;
<<<<<<< HEAD
create user 'root'@'santa.claus.ipv6.example.com';
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
create user 'quota'@'santa.claus.ipv6.example.com';
grant select on test.* to 'quota'@'santa.claus.ipv6.example.com';
connect con1,"::1",root,,test,$MASTER_MYPORT,;

11
mysql-test/suite/perfschema/r/hostcache_ipv6_max_con.result
View File

@@ -16,12 +16,7 @@ create user 'quota'@'santa.claus.ipv6.example.com';
grant select on test.* to 'quota'@'santa.claus.ipv6.example.com';
grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com'
with max_connections_per_hour 3;
<<<<<<< HEAD
connect con1,"::1",root,,test,$MASTER_MYPORT,;
=======
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive
@@ -205,12 +200,8 @@ FIRST_ERROR_SEEN set
LAST_ERROR_SEEN set
grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com'
with max_connections_per_hour 0;
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com'
with max_user_connections 3;
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
flush user_resources;
connect con3a,"::1",quota,,test,$MASTER_MYPORT,;
select "Con7 is alive";
@@ -385,8 +376,6 @@ disconnect con3b;
disconnect con3c;
grant usage on *.* to 'quota'@'santa.claus.ipv6.example.com'
with max_user_connections 0;
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
flush user_resources;
set global max_user_connections = 3;
connect con4a,"::1",quota,,test,$MASTER_MYPORT,;

16
mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_again_allow.result
View File

@@ -11,27 +11,11 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
<<<<<<< HEAD
create user 'root'@'2001:db8::6:6';
grant select on test.* to 'root'@'2001:db8::6:6';
create user 'root'@'santa.claus.ipv6.example.com';
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
connect con1,"::1",root,,test,$MASTER_MYPORT,;
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
grant select on test.* to 'root'@'2001:db8::6:6';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
grant select on test.* to 'root'@'santa.claus.ipv6.example.com';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive

13
mysql-test/suite/perfschema/r/hostcache_ipv6_nameinfo_noname_allow.result
View File

@@ -11,22 +11,9 @@ select `User`, `Host` from mysql.`user` where `user` like '2001:%';
User Host
select `User`, `Host` from mysql.`user` where `user` like 'santa.claus.%';
User Host
<<<<<<< HEAD
create user 'root'@'2001:db8::6:6';
grant select on test.* to 'root'@'2001:db8::6:6';
connect con1,"::1",root,,test,$MASTER_MYPORT,;
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
grant select on test.* to 'root'@'2001:db8::6:6';
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive

7
mysql-test/suite/perfschema/r/hostcache_ipv6_ssl.result
View File

@@ -15,18 +15,11 @@ create user 'user_ssl_x509'@'santa.claus.ipv6.example.com'
identified by 'good_password';
grant select on test.* to 'user_ssl'@'santa.claus.ipv6.example.com'
REQUIRE SSL;
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
grant select on test.* to 'user_ssl_x509'@'santa.claus.ipv6.example.com'
REQUIRE SUBJECT '/C=??/ST=??/L=??/
O=No such thing/
CN=Santa Claus/emailAddress=santa.claus@example.com';
<<<<<<< HEAD
connect con1,"::1",root,,test,$MASTER_MYPORT,;
=======
Warnings:
Warning 1287 Using GRANT statement to modify existing user's properties other than privileges is deprecated and will be removed in future release. Use ALTER USER statement for this operation.
>>>>>>> merge-perfschema-5.7
select "Con1 is alive";
Con1 is alive
Con1 is alive

217
mysql-test/suite/perfschema/r/information_schema.result
View File

@@ -43,21 +43,15 @@ performance_schema events_waits_summary_global_by_event_name def
performance_schema file_instances def
performance_schema file_summary_by_event_name def
performance_schema file_summary_by_instance def
<<<<<<< HEAD
performance_schema hosts def
performance_schema host_cache def
=======
performance_schema global_status def
performance_schema global_variables def
performance_schema host_cache def
performance_schema hosts def
performance_schema host_cache def
performance_schema memory_summary_by_account_by_event_name def
performance_schema memory_summary_by_host_by_event_name def
performance_schema memory_summary_by_thread_by_event_name def
performance_schema memory_summary_by_user_by_event_name def
performance_schema memory_summary_global_by_event_name def
performance_schema metadata_locks def
>>>>>>> 258e16fa2de... WIP 5.7 P_S
performance_schema mutex_instances def
performance_schema objects_summary_global_by_type def
performance_schema performance_timers def
@@ -65,16 +59,11 @@ performance_schema prepared_statements_instances def
performance_schema replication_applier_configuration def
performance_schema replication_applier_status def
performance_schema replication_applier_status_by_coordinator def
performance_schema replication_applier_status_by_worker def
performance_schema replication_connection_configuration def
performance_schema replication_connection_status def
performance_schema replication_group_member_stats def
performance_schema replication_group_members def
performance_schema rwlock_instances def
performance_schema session_account_connect_attrs def
performance_schema session_connect_attrs def
performance_schema session_status def
performance_schema session_variables def
performance_schema setup_actors def
performance_schema setup_consumers def
performance_schema setup_instruments def
@@ -92,9 +81,8 @@ performance_schema table_io_waits_summary_by_index_usage def
performance_schema table_io_waits_summary_by_table def
performance_schema table_lock_waits_summary_by_table def
performance_schema threads def
performance_schema user_variables_by_thread def
performance_schema users def
performance_schema variables_by_thread def
performance_schema user_variables_by_thread def
select lower(TABLE_NAME), TABLE_TYPE, ENGINE
from information_schema.tables
where TABLE_SCHEMA='performance_schema'
@@ -140,21 +128,15 @@ events_waits_summary_global_by_event_name BASE TABLE PERFORMANCE_SCHEMA
file_instances BASE TABLE PERFORMANCE_SCHEMA
file_summary_by_event_name BASE TABLE PERFORMANCE_SCHEMA
file_summary_by_instance BASE TABLE PERFORMANCE_SCHEMA
<<<<<<< HEAD
hosts BASE TABLE PERFORMANCE_SCHEMA
host_cache BASE TABLE PERFORMANCE_SCHEMA
=======
global_status BASE TABLE PERFORMANCE_SCHEMA
global_variables BASE TABLE PERFORMANCE_SCHEMA
host_cache BASE TABLE PERFORMANCE_SCHEMA
hosts BASE TABLE PERFORMANCE_SCHEMA
host_cache BASE TABLE PERFORMANCE_SCHEMA
memory_summary_by_account_by_event_name BASE TABLE PERFORMANCE_SCHEMA
memory_summary_by_host_by_event_name BASE TABLE PERFORMANCE_SCHEMA
memory_summary_by_thread_by_event_name BASE TABLE PERFORMANCE_SCHEMA
memory_summary_by_user_by_event_name BASE TABLE PERFORMANCE_SCHEMA
memory_summary_global_by_event_name BASE TABLE PERFORMANCE_SCHEMA
metadata_locks BASE TABLE PERFORMANCE_SCHEMA
>>>>>>> 258e16fa2de... WIP 5.7 P_S
mutex_instances BASE TABLE PERFORMANCE_SCHEMA
objects_summary_global_by_type BASE TABLE PERFORMANCE_SCHEMA
performance_timers BASE TABLE PERFORMANCE_SCHEMA
@@ -162,16 +144,11 @@ prepared_statements_instances BASE TABLE PERFORMANCE_SCHEMA
replication_applier_configuration BASE TABLE PERFORMANCE_SCHEMA
replication_applier_status BASE TABLE PERFORMANCE_SCHEMA
replication_applier_status_by_coordinator BASE TABLE PERFORMANCE_SCHEMA
replication_applier_status_by_worker BASE TABLE PERFORMANCE_SCHEMA
replication_connection_configuration BASE TABLE PERFORMANCE_SCHEMA
replication_connection_status BASE TABLE PERFORMANCE_SCHEMA
replication_group_member_stats BASE TABLE PERFORMANCE_SCHEMA
replication_group_members BASE TABLE PERFORMANCE_SCHEMA
rwlock_instances BASE TABLE PERFORMANCE_SCHEMA
session_account_connect_attrs BASE TABLE PERFORMANCE_SCHEMA
session_connect_attrs BASE TABLE PERFORMANCE_SCHEMA
session_status BASE TABLE PERFORMANCE_SCHEMA
session_variables BASE TABLE PERFORMANCE_SCHEMA
setup_actors BASE TABLE PERFORMANCE_SCHEMA
setup_consumers BASE TABLE PERFORMANCE_SCHEMA
setup_instruments BASE TABLE PERFORMANCE_SCHEMA
@@ -189,9 +166,8 @@ table_io_waits_summary_by_index_usage BASE TABLE PERFORMANCE_SCHEMA
table_io_waits_summary_by_table BASE TABLE PERFORMANCE_SCHEMA
table_lock_waits_summary_by_table BASE TABLE PERFORMANCE_SCHEMA
threads BASE TABLE PERFORMANCE_SCHEMA
user_variables_by_thread BASE TABLE PERFORMANCE_SCHEMA
users BASE TABLE PERFORMANCE_SCHEMA
variables_by_thread BASE TABLE PERFORMANCE_SCHEMA
user_variables_by_thread BASE TABLE PERFORMANCE_SCHEMA
select lower(TABLE_NAME), VERSION, ROW_FORMAT
from information_schema.tables
where TABLE_SCHEMA='performance_schema'
@@ -237,21 +213,15 @@ events_waits_summary_global_by_event_name 10 Dynamic
file_instances 10 Dynamic
file_summary_by_event_name 10 Dynamic
file_summary_by_instance 10 Dynamic
<<<<<<< HEAD
hosts 10 Fixed
host_cache 10 Dynamic
=======
global_status 10 Dynamic
global_variables 10 Dynamic
host_cache 10 Dynamic
hosts 10 Fixed
host_cache 10 Dynamic
memory_summary_by_account_by_event_name 10 Dynamic
memory_summary_by_host_by_event_name 10 Dynamic
memory_summary_by_thread_by_event_name 10 Dynamic
memory_summary_by_user_by_event_name 10 Dynamic
memory_summary_global_by_event_name 10 Dynamic
metadata_locks 10 Dynamic
>>>>>>> 258e16fa2de... WIP 5.7 P_S
mutex_instances 10 Dynamic
objects_summary_global_by_type 10 Dynamic
performance_timers 10 Fixed
@@ -259,16 +229,11 @@ prepared_statements_instances 10 Dynamic
replication_applier_configuration 10 Fixed
replication_applier_status 10 Fixed
replication_applier_status_by_coordinator 10 Dynamic
replication_applier_status_by_worker 10 Dynamic
replication_connection_configuration 10 Dynamic
replication_connection_status 10 Dynamic
replication_group_member_stats 10 Dynamic
replication_group_members 10 Fixed
rwlock_instances 10 Dynamic
session_account_connect_attrs 10 Dynamic
session_connect_attrs 10 Dynamic
session_status 10 Dynamic
session_variables 10 Dynamic
setup_actors 10 Fixed
setup_consumers 10 Dynamic
setup_instruments 10 Dynamic
@@ -286,13 +251,13 @@ table_io_waits_summary_by_index_usage 10 Dynamic
table_io_waits_summary_by_table 10 Dynamic
table_lock_waits_summary_by_table 10 Dynamic
threads 10 Dynamic
user_variables_by_thread 10 Dynamic
users 10 Fixed
variables_by_thread 10 Dynamic
user_variables_by_thread 10 Dynamic
select lower(TABLE_NAME), AVG_ROW_LENGTH
from information_schema.tables
where TABLE_SCHEMA='performance_schema' and
lower(TABLE_NAME) not regexp '^variables|variables$|^status|session_status|global_status';
lower(TABLE_NAME) not regexp '^variables|variables$|^status|session_status|global_status'
order by table_name;
lower(TABLE_NAME) AVG_ROW_LENGTH
accounts 0
cond_instances 0
@@ -334,8 +299,8 @@ events_waits_summary_global_by_event_name 0
file_instances 0
file_summary_by_event_name 0
file_summary_by_instance 0
host_cache 0
hosts 0
host_cache 0
memory_summary_by_account_by_event_name 0
memory_summary_by_host_by_event_name 0
memory_summary_by_thread_by_event_name 0
@@ -349,11 +314,7 @@ prepared_statements_instances 0
replication_applier_configuration 0
replication_applier_status 0
replication_applier_status_by_coordinator 0
replication_applier_status_by_worker 0
replication_connection_configuration 0
replication_connection_status 0
replication_group_member_stats 0
replication_group_members 0
rwlock_instances 0
session_account_connect_attrs 0
session_connect_attrs 0
@@ -370,80 +331,20 @@ table_io_waits_summary_by_index_usage 0
table_io_waits_summary_by_table 0
table_lock_waits_summary_by_table 0
threads 0
user_variables_by_thread 0
users 0
user_variables_by_thread 0
select lower(TABLE_NAME), TABLE_ROWS, AVG_ROW_LENGTH
from information_schema.tables
<<<<<<< HEAD
where TABLE_SCHEMA='performance_schema'
where TABLE_SCHEMA='performance_schema' and
lower(TABLE_NAME) regexp '^variables|variables$|^status|session_status|global_status'
order by table_name;
lower(TABLE_NAME) TABLE_ROWS AVG_ROW_LENGTH
accounts 1000 0
cond_instances 1000 0
events_stages_current 1000 0
events_stages_history 1000 0
events_stages_history_long 10000 0
events_stages_summary_by_account_by_event_name 1000 0
events_stages_summary_by_host_by_event_name 1000 0
events_stages_summary_by_thread_by_event_name 1000 0
events_stages_summary_by_user_by_event_name 1000 0
events_stages_summary_global_by_event_name 1000 0
events_statements_current 1000 0
events_statements_history 1000 0
events_statements_history_long 10000 0
events_statements_summary_by_account_by_event_name 1000 0
events_statements_summary_by_digest 1000 0
events_statements_summary_by_host_by_event_name 1000 0
events_statements_summary_by_thread_by_event_name 1000 0
events_statements_summary_by_user_by_event_name 1000 0
events_statements_summary_global_by_event_name 1000 0
events_waits_current 1000 0
events_waits_history 1000 0
events_waits_history_long 10000 0
events_waits_summary_by_account_by_event_name 1000 0
events_waits_summary_by_host_by_event_name 1000 0
events_waits_summary_by_instance 1000 0
events_waits_summary_by_thread_by_event_name 1000 0
events_waits_summary_by_user_by_event_name 1000 0
events_waits_summary_global_by_event_name 1000 0
file_instances 1000 0
file_summary_by_event_name 1000 0
file_summary_by_instance 1000 0
hosts 1000 0
host_cache 1000 0
mutex_instances 1000 0
objects_summary_global_by_type 1000 0
performance_timers 5 0
rwlock_instances 1000 0
session_account_connect_attrs 1000 0
session_connect_attrs 1000 0
setup_actors 1 0
setup_consumers 12 0
setup_instruments 1000 0
setup_objects 4 0
setup_timers 4 0
socket_instances 1000 0
socket_summary_by_event_name 1000 0
socket_summary_by_instance 1000 0
table_io_waits_summary_by_index_usage 1000 0
table_io_waits_summary_by_table 1000 0
table_lock_waits_summary_by_table 1000 0
threads 1000 0
users 1000 0
=======
where TABLE_SCHEMA='performance_schema' and
lower(TABLE_NAME) regexp '^variables|variables$|^status|session_status|global_status';
lower(TABLE_NAME) TABLE_ROWS AVG_ROW_LENGTH
global_status table_rows avg_row_len
global_variables table_rows avg_row_len
session_status table_rows avg_row_len
session_variables table_rows avg_row_len
status_by_account table_rows avg_row_len
status_by_host table_rows avg_row_len
status_by_thread table_rows avg_row_len
status_by_user table_rows avg_row_len
variables_by_thread table_rows avg_row_len
>>>>>>> 258e16fa2de... WIP 5.7 P_S
select lower(TABLE_NAME), DATA_LENGTH, MAX_DATA_LENGTH
from information_schema.tables
where TABLE_SCHEMA='performance_schema'
@@ -489,21 +390,15 @@ events_waits_summary_global_by_event_name 0 0
file_instances 0 0
file_summary_by_event_name 0 0
file_summary_by_instance 0 0
<<<<<<< HEAD
hosts 0 0
host_cache 0 0
=======
global_status 0 0
global_variables 0 0
host_cache 0 0
hosts 0 0
host_cache 0 0
memory_summary_by_account_by_event_name 0 0
memory_summary_by_host_by_event_name 0 0
memory_summary_by_thread_by_event_name 0 0
memory_summary_by_user_by_event_name 0 0
memory_summary_global_by_event_name 0 0
metadata_locks 0 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
mutex_instances 0 0
objects_summary_global_by_type 0 0
performance_timers 0 0
@@ -511,16 +406,11 @@ prepared_statements_instances 0 0
replication_applier_configuration 0 0
replication_applier_status 0 0
replication_applier_status_by_coordinator 0 0
replication_applier_status_by_worker 0 0
replication_connection_configuration 0 0
replication_connection_status 0 0
replication_group_member_stats 0 0
replication_group_members 0 0
rwlock_instances 0 0
session_account_connect_attrs 0 0
session_connect_attrs 0 0
session_status 0 0
session_variables 0 0
setup_actors 0 0
setup_consumers 0 0
setup_instruments 0 0
@@ -538,9 +428,8 @@ table_io_waits_summary_by_index_usage 0 0
table_io_waits_summary_by_table 0 0
table_lock_waits_summary_by_table 0 0
threads 0 0
user_variables_by_thread 0 0
users 0 0
variables_by_thread 0 0
user_variables_by_thread 0 0
select lower(TABLE_NAME), INDEX_LENGTH, DATA_FREE, AUTO_INCREMENT
from information_schema.tables
where TABLE_SCHEMA='performance_schema'
@@ -586,21 +475,15 @@ events_waits_summary_global_by_event_name 0 0 NULL
file_instances 0 0 NULL
file_summary_by_event_name 0 0 NULL
file_summary_by_instance 0 0 NULL
<<<<<<< HEAD
hosts 0 0 NULL
host_cache 0 0 NULL
=======
global_status 0 0 NULL
global_variables 0 0 NULL
host_cache 0 0 NULL
hosts 0 0 NULL
host_cache 0 0 NULL
memory_summary_by_account_by_event_name 0 0 NULL
memory_summary_by_host_by_event_name 0 0 NULL
memory_summary_by_thread_by_event_name 0 0 NULL
memory_summary_by_user_by_event_name 0 0 NULL
memory_summary_global_by_event_name 0 0 NULL
metadata_locks 0 0 NULL
>>>>>>> 258e16fa2de... WIP 5.7 P_S
mutex_instances 0 0 NULL
objects_summary_global_by_type 0 0 NULL
performance_timers 0 0 NULL
@@ -608,16 +491,11 @@ prepared_statements_instances 0 0 NULL
replication_applier_configuration 0 0 NULL
replication_applier_status 0 0 NULL
replication_applier_status_by_coordinator 0 0 NULL
replication_applier_status_by_worker 0 0 NULL
replication_connection_configuration 0 0 NULL
replication_connection_status 0 0 NULL
replication_group_member_stats 0 0 NULL
replication_group_members 0 0 NULL
rwlock_instances 0 0 NULL
session_account_connect_attrs 0 0 NULL
session_connect_attrs 0 0 NULL
session_status 0 0 NULL
session_variables 0 0 NULL
setup_actors 0 0 NULL
setup_consumers 0 0 NULL
setup_instruments 0 0 NULL
@@ -635,9 +513,8 @@ table_io_waits_summary_by_index_usage 0 0 NULL
table_io_waits_summary_by_table 0 0 NULL
table_lock_waits_summary_by_table 0 0 NULL
threads 0 0 NULL
user_variables_by_thread 0 0 NULL
users 0 0 NULL
variables_by_thread 0 0 NULL
user_variables_by_thread 0 0 NULL
select lower(TABLE_NAME), CREATE_TIME, UPDATE_TIME, CHECK_TIME
from information_schema.tables
where TABLE_SCHEMA='performance_schema'
@@ -683,21 +560,15 @@ events_waits_summary_global_by_event_name NULL NULL NULL
file_instances NULL NULL NULL
file_summary_by_event_name NULL NULL NULL
file_summary_by_instance NULL NULL NULL
<<<<<<< HEAD
hosts NULL NULL NULL
host_cache NULL NULL NULL
=======
global_status NULL NULL NULL
global_variables NULL NULL NULL
host_cache NULL NULL NULL
hosts NULL NULL NULL
host_cache NULL NULL NULL
memory_summary_by_account_by_event_name NULL NULL NULL
memory_summary_by_host_by_event_name NULL NULL NULL
memory_summary_by_thread_by_event_name NULL NULL NULL
memory_summary_by_user_by_event_name NULL NULL NULL
memory_summary_global_by_event_name NULL NULL NULL
metadata_locks NULL NULL NULL
>>>>>>> 258e16fa2de... WIP 5.7 P_S
mutex_instances NULL NULL NULL
objects_summary_global_by_type NULL NULL NULL
performance_timers NULL NULL NULL
@@ -705,16 +576,11 @@ prepared_statements_instances NULL NULL NULL
replication_applier_configuration NULL NULL NULL
replication_applier_status NULL NULL NULL
replication_applier_status_by_coordinator NULL NULL NULL
replication_applier_status_by_worker NULL NULL NULL
replication_connection_configuration NULL NULL NULL
replication_connection_status NULL NULL NULL
replication_group_member_stats NULL NULL NULL
replication_group_members NULL NULL NULL
rwlock_instances NULL NULL NULL
session_account_connect_attrs NULL NULL NULL
session_connect_attrs NULL NULL NULL
session_status NULL NULL NULL
session_variables NULL NULL NULL
setup_actors NULL NULL NULL
setup_consumers NULL NULL NULL
setup_instruments NULL NULL NULL
@@ -732,9 +598,8 @@ table_io_waits_summary_by_index_usage NULL NULL NULL
table_io_waits_summary_by_table NULL NULL NULL
table_lock_waits_summary_by_table NULL NULL NULL
threads NULL NULL NULL
user_variables_by_thread NULL NULL NULL
users NULL NULL NULL
variables_by_thread NULL NULL NULL
user_variables_by_thread NULL NULL NULL
select lower(TABLE_NAME), TABLE_COLLATION, CHECKSUM
from information_schema.tables
where TABLE_SCHEMA='performance_schema'
@@ -780,21 +645,15 @@ events_waits_summary_global_by_event_name utf8_general_ci NULL
file_instances utf8_general_ci NULL
file_summary_by_event_name utf8_general_ci NULL
file_summary_by_instance utf8_general_ci NULL
<<<<<<< HEAD
hosts utf8_general_ci NULL
host_cache utf8_general_ci NULL
=======
global_status utf8_general_ci NULL
global_variables utf8_general_ci NULL
host_cache utf8_general_ci NULL
hosts utf8_general_ci NULL
host_cache utf8_general_ci NULL
memory_summary_by_account_by_event_name utf8_general_ci NULL
memory_summary_by_host_by_event_name utf8_general_ci NULL
memory_summary_by_thread_by_event_name utf8_general_ci NULL
memory_summary_by_user_by_event_name utf8_general_ci NULL
memory_summary_global_by_event_name utf8_general_ci NULL
metadata_locks utf8_general_ci NULL
>>>>>>> 258e16fa2de... WIP 5.7 P_S
mutex_instances utf8_general_ci NULL
objects_summary_global_by_type utf8_general_ci NULL
performance_timers utf8_general_ci NULL
@@ -802,16 +661,11 @@ prepared_statements_instances utf8_general_ci NULL
replication_applier_configuration utf8_general_ci NULL
replication_applier_status utf8_general_ci NULL
replication_applier_status_by_coordinator utf8_general_ci NULL
replication_applier_status_by_worker utf8_general_ci NULL
replication_connection_configuration utf8_general_ci NULL
replication_connection_status utf8_general_ci NULL
replication_group_member_stats utf8_general_ci NULL
replication_group_members utf8_general_ci NULL
rwlock_instances utf8_general_ci NULL
session_account_connect_attrs utf8_bin NULL
session_connect_attrs utf8_bin NULL
session_status utf8_general_ci NULL
session_variables utf8_general_ci NULL
setup_actors utf8_general_ci NULL
setup_consumers utf8_general_ci NULL
setup_instruments utf8_general_ci NULL
@@ -829,12 +683,12 @@ table_io_waits_summary_by_index_usage utf8_general_ci NULL
table_io_waits_summary_by_table utf8_general_ci NULL
table_lock_waits_summary_by_table utf8_general_ci NULL
threads utf8_general_ci NULL
user_variables_by_thread utf8_general_ci NULL
users utf8_general_ci NULL
variables_by_thread utf8_general_ci NULL
user_variables_by_thread utf8_general_ci NULL
select lower(TABLE_NAME), CREATE_OPTIONS
from information_schema.tables
where TABLE_SCHEMA='performance_schema';
where TABLE_SCHEMA='performance_schema'
order by table_name;
lower(TABLE_NAME) CREATE_OPTIONS
accounts
cond_instances
@@ -877,9 +731,8 @@ file_instances
file_summary_by_event_name
file_summary_by_instance
global_status
global_variables
host_cache
hosts
host_cache
memory_summary_by_account_by_event_name
memory_summary_by_host_by_event_name
memory_summary_by_thread_by_event_name
@@ -893,16 +746,11 @@ prepared_statements_instances
replication_applier_configuration
replication_applier_status
replication_applier_status_by_coordinator
replication_applier_status_by_worker
replication_connection_configuration
replication_connection_status
replication_group_member_stats
replication_group_members
rwlock_instances
session_account_connect_attrs
session_connect_attrs
session_status
session_variables
setup_actors
setup_consumers
setup_instruments
@@ -920,9 +768,8 @@ table_io_waits_summary_by_index_usage
table_io_waits_summary_by_table
table_lock_waits_summary_by_table
threads
user_variables_by_thread
users
variables_by_thread
user_variables_by_thread
select lower(TABLE_NAME), TABLE_COMMENT
from information_schema.tables
where TABLE_SCHEMA='performance_schema'
@@ -968,21 +815,15 @@ events_waits_summary_global_by_event_name
file_instances
file_summary_by_event_name
file_summary_by_instance
<<<<<<< HEAD
hosts
host_cache
=======
global_status
global_variables
host_cache
hosts
host_cache
memory_summary_by_account_by_event_name
memory_summary_by_host_by_event_name
memory_summary_by_thread_by_event_name
memory_summary_by_user_by_event_name
memory_summary_global_by_event_name
metadata_locks
>>>>>>> 258e16fa2de... WIP 5.7 P_S
mutex_instances
objects_summary_global_by_type
performance_timers
@@ -990,16 +831,11 @@ prepared_statements_instances
replication_applier_configuration
replication_applier_status
replication_applier_status_by_coordinator
replication_applier_status_by_worker
replication_connection_configuration
replication_connection_status
replication_group_member_stats
replication_group_members
rwlock_instances
session_account_connect_attrs
session_connect_attrs
session_status
session_variables
setup_actors
setup_consumers
setup_instruments
@@ -1017,6 +853,5 @@ table_io_waits_summary_by_index_usage
table_io_waits_summary_by_table
table_lock_waits_summary_by_table
threads
user_variables_by_thread
users
variables_by_thread
user_variables_by_thread

124
mysql-test/suite/perfschema/r/innodb_table_io.result
View File

@@ -71,98 +71,51 @@ where event_name like 'wait/io/table/%'
and object_schema in ("test")
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
<<<<<<< HEAD
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
show status where Variable_name like 'performance_schema_%' and
Variable_name not like 'performance_schema_%_classes_lost';
=======
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 3
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 3
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab delete 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
show global status like 'performance_schema_%';
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Variable_name Value
Performance_schema_accounts_lost 0
Performance_schema_cond_classes_lost 0
Performance_schema_cond_instances_lost 0
Performance_schema_digest_lost 0
Performance_schema_file_classes_lost 0
Performance_schema_file_handles_lost 0
Performance_schema_file_instances_lost 0
Performance_schema_hosts_lost 0
Performance_schema_index_stat_lost 0
Performance_schema_locker_lost 0
<<<<<<< HEAD
Performance_schema_mutex_instances_lost 0
=======
Performance_schema_memory_classes_lost 0
Performance_schema_metadata_lock_lost 0
Performance_schema_mutex_classes_lost 0
@@ -171,17 +124,16 @@ Performance_schema_nested_statement_lost 0
Performance_schema_prepared_statements_lost 0
Performance_schema_program_lost 0
Performance_schema_rwlock_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_rwlock_instances_lost 0
Performance_schema_session_connect_attrs_lost 0
Performance_schema_socket_classes_lost 0
Performance_schema_socket_instances_lost 0
Performance_schema_stage_classes_lost 0
Performance_schema_statement_classes_lost 0
Performance_schema_table_handles_lost 0
Performance_schema_table_instances_lost 0
<<<<<<< HEAD
=======
Performance_schema_table_lock_stat_lost 0
Performance_schema_thread_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_thread_instances_lost 0
Performance_schema_users_lost 0
truncate performance_schema.events_waits_history_long;

5
mysql-test/suite/perfschema/r/io_cache.result
View File

@@ -1,6 +1,7 @@
## Connection default
connection default;
USE test;
DROP TABLE IF EXISTS t1;
SELECT @@global.binlog_cache_size;
@@ -15,6 +16,7 @@ wait/io/file/sql/io_cache YES YES
## Connection con1
connect con1, localhost, root,,;
USE test;
CREATE TABLE t1 (s1 INT, s2 VARCHAR(4096));
SET SESSION AUTOCOMMIT = 0;
@@ -79,13 +81,16 @@ COMMIT;
SELECT COUNT(*) FROM t1;
COUNT(*)
8
disconnect con1;
## Connection default
connection default;
SELECT COUNT(*) FROM test.t1;
COUNT(*)
8
SELECT COUNT(*) FROM performance_schema.file_summary_by_event_name WHERE event_name LIKE "%io_cache%";
COUNT(*)
1
connection default;
DROP TABLE t1;

16
mysql-test/suite/perfschema/r/max_program_zero.result
View File

@@ -4,7 +4,6 @@ information_schema
mtr
mysql
performance_schema
sys
test
select count(*) from performance_schema.performance_timers;
count(*)
@@ -19,7 +18,7 @@ select count(*) from performance_schema.setup_timers;
count(*)
5
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
select * from performance_schema.accounts;
select * from performance_schema.cond_instances;
select * from performance_schema.events_stages_current;
@@ -93,20 +92,15 @@ select * from performance_schema.table_lock_waits_summary_by_table;
select * from performance_schema.threads;
select * from performance_schema.users;
select * from performance_schema.replication_connection_configuration;
select * from performance_schema.replication_connection_status;
select * from performance_schema.replication_applier_configuration;
select * from performance_schema.replication_applier_status;
select * from performance_schema.replication_applier_status_by_coordinator;
select * from performance_schema.replication_applier_status_by_worker;
select * from performance_schema.global_status;
select * from performance_schema.status_by_thread;
select * from performance_schema.status_by_user;
select * from performance_schema.status_by_host;
select * from performance_schema.status_by_account;
select * from performance_schema.session_status;
select * from performance_schema.global_variables;
select * from performance_schema.variables_by_thread;
select * from performance_schema.session_variables;
show global variables like "performance_schema%";
Variable_name Value
performance_schema ON
@@ -121,7 +115,7 @@ performance_schema_events_transactions_history_size 10
performance_schema_events_waits_history_long_size 10000
performance_schema_events_waits_history_size 10
performance_schema_hosts_size 100
performance_schema_max_cond_classes 80
performance_schema_max_cond_classes 90
performance_schema_max_cond_instances 1000
performance_schema_max_digest_length 1024
performance_schema_max_file_classes 80
@@ -139,8 +133,8 @@ performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
performance_schema_max_sql_text_length 1024
performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 193
performance_schema_max_stage_classes 160
performance_schema_max_statement_classes 222
performance_schema_max_statement_stack 1
performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500
@@ -172,7 +166,7 @@ data INT NOT NULL
CREATE TABLE t2(
n INT UNSIGNED NOT NULL,
f BIGINT UNSIGNED
);
) engine=innodb;
############################
# Creating Stored Programs #
############################

235
mysql-test/suite/perfschema/r/mdl_func.result
View File

@@ -5,21 +5,16 @@ WHERE name in ('wait/io/table/sql/handler',
'wait/lock/metadata/sql/mdl');
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
grant ALL on *.* to user1@localhost;
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
grant ALL on *.* to user2@localhost;
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
insert into performance_schema.setup_objects (object_type, object_schema, object_name, enabled, timed)
values ('TABLE', 'mtr', '%', 'NO', 'NO');
# Switch to (con1, localhost, user1, , )
connect con1, localhost, user1, , ;
# Switch to (con2, localhost, user2, , )
connect con2, localhost, user2, , ;
connection default;
drop function if exists thread_id_name;
create function thread_id_name(THREAD_ID int)
returns varchar(16)
@@ -89,10 +84,12 @@ INSERT INTO t1 (id) VALUES (1), (2), (3), (4), (5), (6), (7), (8);
TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.events_waits_current;
connection con1;
BEGIN;
SELECT * from t1 where id=1;
id b
1 initial value
connection default;
"---- Marker 1 ----"
execute dump_metadata_locks;
OBJECT_TYPE FUNCTION
@@ -120,18 +117,14 @@ execute dump_table_handles;
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
INTERNAL_LOCK READ
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
execute dump_waits_current;
execute dump_waits_history_long;
connection con1;
COMMIT;
connection default;
"---- Marker 2 ----"
execute dump_metadata_locks;
OBJECT_TYPE FUNCTION
@@ -152,19 +145,15 @@ execute dump_table_handles;
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
INTERNAL_LOCK READ
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
execute dump_waits_current;
execute dump_waits_history_long;
connection con1;
BEGIN;
UPDATE t1 set b="new value" where id=2;
connection default;
"---- Marker 3 ----"
execute dump_metadata_locks;
OBJECT_TYPE FUNCTION
@@ -192,19 +181,15 @@ execute dump_table_handles;
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
INTERNAL_LOCK WRITE
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
execute dump_waits_current;
execute dump_waits_history_long;
connection con2;
BEGIN;
DROP TABLE t1;;
connection default;
"---- Marker 4 ----"
execute dump_metadata_locks;
OBJECT_TYPE FUNCTION
@@ -214,13 +199,6 @@ LOCK_TYPE SHARED
LOCK_DURATION TRANSACTION
LOCK_STATUS GRANTED
OWNER_THREAD_ID OTHER
OBJECT_TYPE GLOBAL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
LOCK_TYPE INTENTION_EXCLUSIVE
LOCK_DURATION STATEMENT
LOCK_STATUS GRANTED
OWNER_THREAD_ID USER2
OBJECT_TYPE SCHEMA
OBJECT_SCHEMA test
OBJECT_NAME NULL
@@ -253,13 +231,7 @@ execute dump_table_handles;
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
INTERNAL_LOCK WRITE
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
execute dump_waits_current;
@@ -273,7 +245,10 @@ OBJECT_NAME t1
INDEX_NAME NULL
OPERATION metadata lock
execute dump_waits_history_long;
connection con1;
COMMIT;
connection con2;
connection default;
"---- Marker 5 ----"
execute dump_metadata_locks;
OBJECT_TYPE FUNCTION
@@ -311,11 +286,14 @@ OBJECT_SCHEMA test
OBJECT_NAME t1
INDEX_NAME NULL
OPERATION metadata lock
connection default;
TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.events_waits_current;
create table t1 (a int);
connection con1;
LOCK TABLE t1 READ;
connection default;
"---- Marker 6 ----"
execute dump_metadata_locks;
OBJECT_TYPE FUNCTION
@@ -335,7 +313,7 @@ OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
LOCK_TYPE SHARED_READ_ONLY
LOCK_TYPE SHARED_READ
LOCK_DURATION TRANSACTION
LOCK_STATUS GRANTED
OWNER_THREAD_ID USER1
@@ -343,12 +321,14 @@ execute dump_table_handles;
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
INTERNAL_LOCK READ NO INSERT
EXTERNAL_LOCK READ EXTERNAL
OWNER_THREAD_ID USER1
execute dump_waits_current;
execute dump_waits_history_long;
connection con2;
LOCK TABLE t1 write;;
connection default;
"---- Marker 7 ----"
execute dump_metadata_locks;
OBJECT_TYPE FUNCTION
@@ -358,13 +338,6 @@ LOCK_TYPE SHARED
LOCK_DURATION TRANSACTION
LOCK_STATUS GRANTED
OWNER_THREAD_ID OTHER
OBJECT_TYPE GLOBAL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
LOCK_TYPE INTENTION_EXCLUSIVE
LOCK_DURATION STATEMENT
LOCK_STATUS GRANTED
OWNER_THREAD_ID USER2
OBJECT_TYPE SCHEMA
OBJECT_SCHEMA test
OBJECT_NAME NULL
@@ -389,7 +362,7 @@ OWNER_THREAD_ID USER2
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
LOCK_TYPE SHARED_READ_ONLY
LOCK_TYPE SHARED_READ
LOCK_DURATION TRANSACTION
LOCK_STATUS GRANTED
OWNER_THREAD_ID USER1
@@ -397,7 +370,7 @@ execute dump_table_handles;
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
INTERNAL_LOCK READ NO INSERT
EXTERNAL_LOCK READ EXTERNAL
OWNER_THREAD_ID USER1
execute dump_waits_current;
@@ -411,9 +384,26 @@ OBJECT_NAME t1
INDEX_NAME NULL
OPERATION metadata lock
execute dump_waits_history_long;
connection con1;
UNLOCK TABLES;
connection con2;
connection default;
"---- Marker 8 ----"
execute dump_metadata_locks;
OBJECT_TYPE BACKUP
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
LOCK_TYPE BACKUP_DDL
LOCK_DURATION STATEMENT
LOCK_STATUS GRANTED
OWNER_THREAD_ID USER2
OBJECT_TYPE BACKUP
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
LOCK_TYPE BACKUP_DML
LOCK_DURATION STATEMENT
LOCK_STATUS GRANTED
OWNER_THREAD_ID USER2
OBJECT_TYPE FUNCTION
OBJECT_SCHEMA test
OBJECT_NAME thread_id_name
@@ -421,13 +411,6 @@ LOCK_TYPE SHARED
LOCK_DURATION TRANSACTION
LOCK_STATUS GRANTED
OWNER_THREAD_ID OTHER
OBJECT_TYPE GLOBAL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
LOCK_TYPE INTENTION_EXCLUSIVE
LOCK_DURATION STATEMENT
LOCK_STATUS GRANTED
OWNER_THREAD_ID USER2
OBJECT_TYPE SCHEMA
OBJECT_SCHEMA test
OBJECT_NAME NULL
@@ -453,13 +436,7 @@ execute dump_table_handles;
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
INTERNAL_LOCK WRITE
EXTERNAL_LOCK WRITE EXTERNAL
OWNER_THREAD_ID USER2
execute dump_waits_current;
@@ -473,9 +450,25 @@ OBJECT_SCHEMA test
OBJECT_NAME t1
INDEX_NAME NULL
OPERATION metadata lock
connection con1;
LOCK TABLES t1 read;;
connection default;
"---- Marker 9 ----"
execute dump_metadata_locks;
OBJECT_TYPE BACKUP
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
LOCK_TYPE BACKUP_DDL
LOCK_DURATION STATEMENT
LOCK_STATUS GRANTED
OWNER_THREAD_ID USER2
OBJECT_TYPE BACKUP
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
LOCK_TYPE BACKUP_DML
LOCK_DURATION STATEMENT
LOCK_STATUS GRANTED
OWNER_THREAD_ID USER2
OBJECT_TYPE FUNCTION
OBJECT_SCHEMA test
OBJECT_NAME thread_id_name
@@ -483,13 +476,6 @@ LOCK_TYPE SHARED
LOCK_DURATION TRANSACTION
LOCK_STATUS GRANTED
OWNER_THREAD_ID OTHER
OBJECT_TYPE GLOBAL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
LOCK_TYPE INTENTION_EXCLUSIVE
LOCK_DURATION STATEMENT
LOCK_STATUS GRANTED
OWNER_THREAD_ID USER2
OBJECT_TYPE SCHEMA
OBJECT_SCHEMA test
OBJECT_NAME NULL
@@ -514,7 +500,7 @@ OWNER_THREAD_ID USER2
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
LOCK_TYPE SHARED_READ_ONLY
LOCK_TYPE SHARED_READ
LOCK_DURATION TRANSACTION
LOCK_STATUS PENDING
OWNER_THREAD_ID USER1
@@ -522,13 +508,7 @@ execute dump_table_handles;
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
INTERNAL_LOCK WRITE
EXTERNAL_LOCK WRITE EXTERNAL
OWNER_THREAD_ID USER2
execute dump_waits_current;
@@ -551,7 +531,10 @@ OBJECT_SCHEMA test
OBJECT_NAME t1
INDEX_NAME NULL
OPERATION metadata lock
connection con2;
UNLOCK TABLES;
connection con1;
connection default;
"---- Marker 10 ----"
execute dump_metadata_locks;
OBJECT_TYPE FUNCTION
@@ -571,7 +554,7 @@ OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
LOCK_TYPE SHARED_READ_ONLY
LOCK_TYPE SHARED_READ
LOCK_DURATION TRANSACTION
LOCK_STATUS GRANTED
OWNER_THREAD_ID USER1
@@ -579,13 +562,7 @@ execute dump_table_handles;
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
INTERNAL_LOCK READ NO INSERT
EXTERNAL_LOCK READ EXTERNAL
OWNER_THREAD_ID USER1
execute dump_waits_current;
@@ -608,7 +585,9 @@ OBJECT_SCHEMA test
OBJECT_NAME t1
INDEX_NAME NULL
OPERATION metadata lock
connection con1;
UNLOCK TABLES;
connection default;
"---- Marker 11 ----"
execute dump_metadata_locks;
OBJECT_TYPE FUNCTION
@@ -629,13 +608,7 @@ execute dump_table_handles;
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
INTERNAL_LOCK READ NO INSERT
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
execute dump_waits_current;
@@ -661,8 +634,10 @@ OPERATION metadata lock
TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.events_waits_current;
connection con1;
BEGIN;
UPDATE LOW_PRIORITY t1 SET a=8;
connection default;
"---- Marker 12 ----"
execute dump_metadata_locks;
OBJECT_TYPE FUNCTION
@@ -682,7 +657,7 @@ OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
LOCK_TYPE SHARED_WRITE_LOW_PRIO
LOCK_TYPE SHARED_WRITE
LOCK_DURATION TRANSACTION
LOCK_STATUS GRANTED
OWNER_THREAD_ID USER1
@@ -690,24 +665,22 @@ execute dump_table_handles;
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
INTERNAL_LOCK WRITE LOW PRIORITY
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
execute dump_waits_current;
execute dump_waits_history_long;
connection con1;
COMMIT;
connection default;
TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.events_waits_current;
connection con1;
SELECT GET_LOCK('test', 0);
GET_LOCK('test', 0)
1
connection default;
"---- Marker 13 ----"
execute dump_metadata_locks;
OBJECT_TYPE FUNCTION
@@ -727,7 +700,7 @@ OWNER_THREAD_ID OTHER
OBJECT_TYPE USER LEVEL LOCK
OBJECT_SCHEMA NULL
OBJECT_NAME test
LOCK_TYPE EXCLUSIVE
LOCK_TYPE SHARED_NO_WRITE
LOCK_DURATION EXPLICIT
LOCK_STATUS GRANTED
OWNER_THREAD_ID USER1
@@ -735,18 +708,14 @@ execute dump_table_handles;
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
INTERNAL_LOCK WRITE LOW PRIORITY
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
execute dump_waits_current;
execute dump_waits_history_long;
connection con2;
SELECT GET_LOCK('test', 120);;
connection default;
"---- Marker 14 ----"
execute dump_metadata_locks;
OBJECT_TYPE FUNCTION
@@ -766,14 +735,14 @@ OWNER_THREAD_ID OTHER
OBJECT_TYPE USER LEVEL LOCK
OBJECT_SCHEMA NULL
OBJECT_NAME test
LOCK_TYPE EXCLUSIVE
LOCK_TYPE SHARED_NO_WRITE
LOCK_DURATION EXPLICIT
LOCK_STATUS GRANTED
OWNER_THREAD_ID USER1
OBJECT_TYPE USER LEVEL LOCK
OBJECT_SCHEMA NULL
OBJECT_NAME test
LOCK_TYPE EXCLUSIVE
LOCK_TYPE SHARED_NO_WRITE
LOCK_DURATION EXPLICIT
LOCK_STATUS PENDING
OWNER_THREAD_ID USER2
@@ -781,13 +750,7 @@ execute dump_table_handles;
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
INTERNAL_LOCK WRITE LOW PRIORITY
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
execute dump_waits_current;
@@ -801,11 +764,14 @@ OBJECT_NAME test
INDEX_NAME NULL
OPERATION metadata lock
execute dump_waits_history_long;
connection con1;
SELECT RELEASE_LOCK('test');
RELEASE_LOCK('test')
1
connection con2;
GET_LOCK('test', 120)
1
connection default;
"---- Marker 15 ----"
execute dump_metadata_locks;
OBJECT_TYPE FUNCTION
@@ -825,7 +791,7 @@ OWNER_THREAD_ID OTHER
OBJECT_TYPE USER LEVEL LOCK
OBJECT_SCHEMA NULL
OBJECT_NAME test
LOCK_TYPE EXCLUSIVE
LOCK_TYPE SHARED_NO_WRITE
LOCK_DURATION EXPLICIT
LOCK_STATUS GRANTED
OWNER_THREAD_ID USER2
@@ -833,13 +799,7 @@ execute dump_table_handles;
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
INTERNAL_LOCK WRITE LOW PRIORITY
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
execute dump_waits_current;
@@ -862,9 +822,11 @@ OBJECT_SCHEMA NULL
OBJECT_NAME test
INDEX_NAME NULL
OPERATION metadata lock
connection con2;
SELECT RELEASE_LOCK('test');
RELEASE_LOCK('test')
1
connection default;
"---- Marker 16 ----"
execute dump_metadata_locks;
OBJECT_TYPE FUNCTION
@@ -885,13 +847,7 @@ execute dump_table_handles;
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
OBJECT_TYPE TABLE
OBJECT_SCHEMA test
OBJECT_NAME t1
INTERNAL_LOCK NULL
INTERNAL_LOCK WRITE LOW PRIORITY
EXTERNAL_LOCK NULL
OWNER_THREAD_ID OTHER
execute dump_waits_current;
@@ -914,6 +870,9 @@ OBJECT_SCHEMA NULL
OBJECT_NAME test
INDEX_NAME NULL
OPERATION metadata lock
disconnect con1;
disconnect con2;
connection default;
drop table t1;
UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
revoke all privileges, grant option from user1@localhost;

1362
mysql-test/suite/perfschema/r/memory_aggregate.result
View File

File diff suppressed because it is too large Load Diff

2218
mysql-test/suite/perfschema/r/memory_aggregate_32bit.result
View File

File diff suppressed because it is too large Load Diff

1128
mysql-test/suite/perfschema/r/memory_aggregate_no_a.result
View File

File diff suppressed because it is too large Load Diff

958
mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_h.result
View File

File diff suppressed because it is too large Load Diff

870
mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_u.result
View File

File diff suppressed because it is too large Load Diff

700
mysql-test/suite/perfschema/r/memory_aggregate_no_a_no_u_no_h.result
View File

File diff suppressed because it is too large Load Diff

1192
mysql-test/suite/perfschema/r/memory_aggregate_no_h.result
View File

File diff suppressed because it is too large Load Diff

1104
mysql-test/suite/perfschema/r/memory_aggregate_no_u.result
View File

File diff suppressed because it is too large Load Diff

934
mysql-test/suite/perfschema/r/memory_aggregate_no_u_no_h.result
View File

File diff suppressed because it is too large Load Diff

126
mysql-test/suite/perfschema/r/memory_table_io.result
View File

@@ -70,100 +70,51 @@ where event_name like 'wait/io/table/%'
and object_schema in ("test")
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
<<<<<<< HEAD
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
show status where Variable_name like 'performance_schema_%' and
Variable_name not like 'performance_schema_%_classes_lost';
=======
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 3
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 3
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab delete 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
show global status like 'performance_schema_%';
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Variable_name Value
Performance_schema_accounts_lost 0
Performance_schema_cond_classes_lost 0
Performance_schema_cond_instances_lost 0
Performance_schema_digest_lost 0
Performance_schema_file_classes_lost 0
Performance_schema_file_handles_lost 0
Performance_schema_file_instances_lost 0
Performance_schema_hosts_lost 0
Performance_schema_index_stat_lost 0
Performance_schema_locker_lost 0
<<<<<<< HEAD
Performance_schema_mutex_instances_lost 0
=======
Performance_schema_memory_classes_lost 0
Performance_schema_metadata_lock_lost 0
Performance_schema_mutex_classes_lost 0
@@ -172,17 +123,16 @@ Performance_schema_nested_statement_lost 0
Performance_schema_prepared_statements_lost 0
Performance_schema_program_lost 0
Performance_schema_rwlock_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_rwlock_instances_lost 0
Performance_schema_session_connect_attrs_lost 0
Performance_schema_socket_classes_lost 0
Performance_schema_socket_instances_lost 0
Performance_schema_stage_classes_lost 0
Performance_schema_statement_classes_lost 0
Performance_schema_table_handles_lost 0
Performance_schema_table_instances_lost 0
<<<<<<< HEAD
=======
Performance_schema_table_lock_stat_lost 0
Performance_schema_thread_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_thread_instances_lost 0
Performance_schema_users_lost 0
truncate performance_schema.events_waits_history_long;

142
mysql-test/suite/perfschema/r/merge_table_io.result
View File

@@ -96,110 +96,57 @@ where event_name like 'wait/io/table/%'
and object_schema in ("test")
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
<<<<<<< HEAD
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
show status where Variable_name like 'performance_schema_%' and
Variable_name not like 'performance_schema_%_classes_lost';
=======
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 3
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 3
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab delete 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
show global status like 'performance_schema_%';
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Variable_name Value
Performance_schema_accounts_lost 0
Performance_schema_cond_classes_lost 0
Performance_schema_cond_instances_lost 0
Performance_schema_digest_lost 0
Performance_schema_file_classes_lost 0
Performance_schema_file_handles_lost 0
Performance_schema_file_instances_lost 0
Performance_schema_hosts_lost 0
Performance_schema_index_stat_lost 0
Performance_schema_locker_lost 0
<<<<<<< HEAD
Performance_schema_mutex_instances_lost 0
=======
Performance_schema_memory_classes_lost 0
Performance_schema_metadata_lock_lost 0
Performance_schema_mutex_classes_lost 0
@@ -208,17 +155,16 @@ Performance_schema_nested_statement_lost 0
Performance_schema_prepared_statements_lost 0
Performance_schema_program_lost 0
Performance_schema_rwlock_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_rwlock_instances_lost 0
Performance_schema_session_connect_attrs_lost 0
Performance_schema_socket_classes_lost 0
Performance_schema_socket_instances_lost 0
Performance_schema_stage_classes_lost 0
Performance_schema_statement_classes_lost 0
Performance_schema_table_handles_lost 0
Performance_schema_table_instances_lost 0
<<<<<<< HEAD
=======
Performance_schema_table_lock_stat_lost 0
Performance_schema_thread_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_thread_instances_lost 0
Performance_schema_users_lost 0
truncate performance_schema.events_waits_history_long;

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

@@ -96,10 +96,8 @@ show global variables like "performance_schema_max_thread_instances";
Variable_name Value
performance_schema_max_thread_instances 200
explain select * from performance_schema.threads;
id select_type table partitions type possible_keys key key_len ref rows filtered Extra
1 SIMPLE threads NULL ALL NULL NULL NULL NULL 256 100.00 NULL
Warnings:
Note 1003 /* select#1 */ select `performance_schema`.`threads`.`THREAD_ID` AS `THREAD_ID`,`performance_schema`.`threads`.`NAME` AS `NAME`,`performance_schema`.`threads`.`TYPE` AS `TYPE`,`performance_schema`.`threads`.`PROCESSLIST_ID` AS `PROCESSLIST_ID`,`performance_schema`.`threads`.`PROCESSLIST_USER` AS `PROCESSLIST_USER`,`performance_schema`.`threads`.`PROCESSLIST_HOST` AS `PROCESSLIST_HOST`,`performance_schema`.`threads`.`PROCESSLIST_DB` AS `PROCESSLIST_DB`,`performance_schema`.`threads`.`PROCESSLIST_COMMAND` AS `PROCESSLIST_COMMAND`,`performance_schema`.`threads`.`PROCESSLIST_TIME` AS `PROCESSLIST_TIME`,`performance_schema`.`threads`.`PROCESSLIST_STATE` AS `PROCESSLIST_STATE`,`performance_schema`.`threads`.`PROCESSLIST_INFO` AS `PROCESSLIST_INFO`,`performance_schema`.`threads`.`PARENT_THREAD_ID` AS `PARENT_THREAD_ID`,`performance_schema`.`threads`.`ROLE` AS `ROLE`,`performance_schema`.`threads`.`INSTRUMENTED` AS `INSTRUMENTED`,`performance_schema`.`threads`.`HISTORY` AS `HISTORY`,`performance_schema`.`threads`.`CONNECTION_TYPE` AS `CONNECTION_TYPE`,`performance_schema`.`threads`.`THREAD_OS_ID` AS `THREAD_OS_ID` from `performance_schema`.`threads`
id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE threads ALL NULL NULL NULL NULL 256
use performance_schema;
show events;
Db Name Definer Time zone Type Execute at Interval value Interval field Starts Ends Status Originator character_set_client collation_connection Database Collation

80
mysql-test/suite/perfschema/r/multi_table_io.result
View File

@@ -52,67 +52,38 @@ where event_name like 'wait/io/table/%'
and object_schema in ('test','test1')
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
<<<<<<< HEAD
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test1 t2 insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test t1 update NULL
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test1 t2 update NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test t1 delete NULL
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test1 t2 delete NULL
<<<<<<< HEAD
show status where Variable_name like 'performance_schema_%' and
Variable_name not like 'performance_schema_%_classes_lost';
=======
show status like 'performance_schema_%';
=======
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test t1 update 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 update 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test t1 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 fetch 1
wait/io/table/sql/handler handler.cc: TABLE test t1 delete 1
wait/io/table/sql/handler handler.cc: TABLE test1 t2 delete 1
wait/io/table/sql/handler TABLE test t1 fetch 1
wait/io/table/sql/handler TABLE test1 t2 insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test t1 fetch 1
wait/io/table/sql/handler TABLE test1 t2 fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test t1 fetch 1
wait/io/table/sql/handler TABLE test1 t2 fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test t1 fetch 1
wait/io/table/sql/handler TABLE test1 t2 fetch 1
wait/io/table/sql/handler TABLE test t1 update 1
wait/io/table/sql/handler TABLE test1 t2 fetch 1
wait/io/table/sql/handler TABLE test1 t2 update 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test t1 fetch 1
wait/io/table/sql/handler TABLE test1 t2 fetch 1
wait/io/table/sql/handler TABLE test t1 delete 1
wait/io/table/sql/handler TABLE test1 t2 fetch 1
wait/io/table/sql/handler TABLE test1 t2 delete 1
show global status like 'performance_schema_%';
>>>>>>> merge-perfschema-5.7
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Variable_name Value
Performance_schema_accounts_lost 0
Performance_schema_cond_classes_lost 0
Performance_schema_cond_instances_lost 0
Performance_schema_digest_lost 0
Performance_schema_file_classes_lost 0
Performance_schema_file_handles_lost 0
Performance_schema_file_instances_lost 0
Performance_schema_hosts_lost 0
Performance_schema_index_stat_lost 0
Performance_schema_locker_lost 0
<<<<<<< HEAD
Performance_schema_mutex_instances_lost 0
=======
Performance_schema_memory_classes_lost 0
Performance_schema_metadata_lock_lost 0
Performance_schema_mutex_classes_lost 0
@@ -121,17 +92,16 @@ Performance_schema_nested_statement_lost 0
Performance_schema_prepared_statements_lost 0
Performance_schema_program_lost 0
Performance_schema_rwlock_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_rwlock_instances_lost 0
Performance_schema_session_connect_attrs_lost 0
Performance_schema_socket_classes_lost 0
Performance_schema_socket_instances_lost 0
Performance_schema_stage_classes_lost 0
Performance_schema_statement_classes_lost 0
Performance_schema_table_handles_lost 0
Performance_schema_table_instances_lost 0
<<<<<<< HEAD
=======
Performance_schema_table_lock_stat_lost 0
Performance_schema_thread_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_thread_instances_lost 0
Performance_schema_users_lost 0
truncate performance_schema.events_waits_history_long;

124
mysql-test/suite/perfschema/r/myisam_table_io.result
View File

@@ -70,98 +70,51 @@ where event_name like 'wait/io/table/%'
and object_schema in ("test")
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
<<<<<<< HEAD
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
show status where Variable_name like 'performance_schema_%' and
Variable_name not like 'performance_schema_%_classes_lost';
=======
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 3
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 3
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab delete 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
show global status like 'performance_schema_%';
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Variable_name Value
Performance_schema_accounts_lost 0
Performance_schema_cond_classes_lost 0
Performance_schema_cond_instances_lost 0
Performance_schema_digest_lost 0
Performance_schema_file_classes_lost 0
Performance_schema_file_handles_lost 0
Performance_schema_file_instances_lost 0
Performance_schema_hosts_lost 0
Performance_schema_index_stat_lost 0
Performance_schema_locker_lost 0
<<<<<<< HEAD
Performance_schema_mutex_instances_lost 0
=======
Performance_schema_memory_classes_lost 0
Performance_schema_metadata_lock_lost 0
Performance_schema_mutex_classes_lost 0
@@ -170,17 +123,16 @@ Performance_schema_nested_statement_lost 0
Performance_schema_prepared_statements_lost 0
Performance_schema_program_lost 0
Performance_schema_rwlock_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_rwlock_instances_lost 0
Performance_schema_session_connect_attrs_lost 0
Performance_schema_socket_classes_lost 0
Performance_schema_socket_instances_lost 0
Performance_schema_stage_classes_lost 0
Performance_schema_statement_classes_lost 0
Performance_schema_table_handles_lost 0
Performance_schema_table_instances_lost 0
<<<<<<< HEAD
=======
Performance_schema_table_lock_stat_lost 0
Performance_schema_thread_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_thread_instances_lost 0
Performance_schema_users_lost 0
truncate performance_schema.events_waits_history_long;

256
mysql-test/suite/perfschema/r/nesting.result
View File

@@ -1,14 +1,4 @@
<<<<<<< HEAD
connect con1, localhost, user1, , ;
=======
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
"================== con1 connected =================="
>>>>>>> merge-perfschema-5.7
select "MARKER_BEGIN" as marker;
marker
MARKER_BEGIN
@@ -124,28 +114,21 @@ and (end_event_id <= @marker_end)
) all_events
order by relative_event_id asc;
relative_event_id relative_end_event_id event_name comment nesting_event_type relative_nesting_event_id
<<<<<<< HEAD
0 20 statement/sql/select select "MARKER_BEGIN" as marker NULL NULL
1 4 stage/sql/Init (stage) STATEMENT 0
=======
<<<<<<< HEAD
0 18 statement/sql/select select "MARKER_BEGIN" as marker NULL NULL
1 4 stage/sql/init (stage) STATEMENT 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
1 4 stage/sql/starting (stage) STATEMENT 0
2 2 wait/io/socket/sql/client_connection recv STAGE 1
3 3 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 1
4 4 wait/io/file/sql/query_log write STAGE 1
5 5 stage/sql/Checking permissions (stage) STATEMENT 0
5 5 stage/sql/checking permissions (stage) STATEMENT 0
6 6 stage/sql/Opening tables (stage) STATEMENT 0
7 7 stage/sql/After opening tables (stage) STATEMENT 0
<<<<<<< HEAD
8 8 stage/sql/Init (stage) STATEMENT 0
8 8 stage/sql/init (stage) STATEMENT 0
9 9 stage/sql/Optimizing (stage) STATEMENT 0
10 10 stage/sql/Executing (stage) STATEMENT 0
11 11 stage/sql/End of update loop (stage) STATEMENT 0
12 12 stage/sql/Query end (stage) STATEMENT 0
13 13 stage/sql/Commit (stage) STATEMENT 0
14 14 stage/sql/Closing tables (stage) STATEMENT 0
14 14 stage/sql/closing tables (stage) STATEMENT 0
15 15 stage/sql/Starting cleanup (stage) STATEMENT 0
16 16 stage/sql/Freeing items (stage) STATEMENT 0
17 17 wait/io/socket/sql/client_connection send STATEMENT 0
@@ -154,20 +137,20 @@ relative_event_id relative_end_event_id event_name comment nesting_event_type re
20 20 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 19
21 21 idle idle NULL NULL
22 42 statement/sql/select select "This is simple statement one" as payload NULL NULL
23 26 stage/sql/Init (stage) STATEMENT 22
23 26 stage/sql/starting (stage) STATEMENT 22
24 24 wait/io/socket/sql/client_connection recv STAGE 23
25 25 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 23
26 26 wait/io/file/sql/query_log write STAGE 23
27 27 stage/sql/Checking permissions (stage) STATEMENT 22
27 27 stage/sql/checking permissions (stage) STATEMENT 22
28 28 stage/sql/Opening tables (stage) STATEMENT 22
29 29 stage/sql/After opening tables (stage) STATEMENT 22
30 30 stage/sql/Init (stage) STATEMENT 22
30 30 stage/sql/init (stage) STATEMENT 22
31 31 stage/sql/Optimizing (stage) STATEMENT 22
32 32 stage/sql/Executing (stage) STATEMENT 22
33 33 stage/sql/End of update loop (stage) STATEMENT 22
34 34 stage/sql/Query end (stage) STATEMENT 22
35 35 stage/sql/Commit (stage) STATEMENT 22
36 36 stage/sql/Closing tables (stage) STATEMENT 22
36 36 stage/sql/closing tables (stage) STATEMENT 22
37 37 stage/sql/Starting cleanup (stage) STATEMENT 22
38 38 stage/sql/Freeing items (stage) STATEMENT 22
39 39 wait/io/socket/sql/client_connection send STATEMENT 22
@@ -176,20 +159,20 @@ relative_event_id relative_end_event_id event_name comment nesting_event_type re
42 42 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 41
43 43 idle idle NULL NULL
44 64 statement/sql/select select "This is simple statement two" as payload NULL NULL
45 48 stage/sql/Init (stage) STATEMENT 44
45 48 stage/sql/starting (stage) STATEMENT 44
46 46 wait/io/socket/sql/client_connection recv STAGE 45
47 47 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 45
48 48 wait/io/file/sql/query_log write STAGE 45
49 49 stage/sql/Checking permissions (stage) STATEMENT 44
49 49 stage/sql/checking permissions (stage) STATEMENT 44
50 50 stage/sql/Opening tables (stage) STATEMENT 44
51 51 stage/sql/After opening tables (stage) STATEMENT 44
52 52 stage/sql/Init (stage) STATEMENT 44
52 52 stage/sql/init (stage) STATEMENT 44
53 53 stage/sql/Optimizing (stage) STATEMENT 44
54 54 stage/sql/Executing (stage) STATEMENT 44
55 55 stage/sql/End of update loop (stage) STATEMENT 44
56 56 stage/sql/Query end (stage) STATEMENT 44
57 57 stage/sql/Commit (stage) STATEMENT 44
58 58 stage/sql/Closing tables (stage) STATEMENT 44
58 58 stage/sql/closing tables (stage) STATEMENT 44
59 59 stage/sql/Starting cleanup (stage) STATEMENT 44
60 60 stage/sql/Freeing items (stage) STATEMENT 44
61 61 wait/io/socket/sql/client_connection send STATEMENT 44
@@ -198,125 +181,59 @@ relative_event_id relative_end_event_id event_name comment nesting_event_type re
64 64 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 63
65 65 idle idle NULL NULL
66 85 statement/sql/select select "This is the first part of a multi query" as payload;
=======
=======
0 17 statement/sql/select select "MARKER_BEGIN" as marker NULL NULL
1 5 stage/sql/starting (stage) STATEMENT 0
2 2 wait/io/socket/sql/client_connection recv STAGE 1
3 3 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 1
4 4 wait/synch/mutex/sql/THD::LOCK_thd_query lock STAGE 1
5 5 wait/io/file/sql/query_log write STAGE 1
6 6 stage/sql/checking permissions (stage) STATEMENT 0
7 7 stage/sql/Opening tables (stage) STATEMENT 0
>>>>>>> merge-perfschema-5.7
8 8 stage/sql/init (stage) STATEMENT 0
9 9 stage/sql/optimizing (stage) STATEMENT 0
10 10 stage/sql/executing (stage) STATEMENT 0
11 11 stage/sql/end (stage) STATEMENT 0
12 12 stage/sql/query end (stage) STATEMENT 0
13 13 stage/sql/closing tables (stage) STATEMENT 0
<<<<<<< HEAD
14 14 stage/sql/freeing items (stage) STATEMENT 0
15 15 wait/io/socket/sql/client_connection send STATEMENT 0
16 16 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 0
17 18 stage/sql/cleaning up (stage) STATEMENT 0
18 18 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 17
19 19 idle idle NULL NULL
20 38 statement/sql/select select "This is simple statement one" as payload NULL NULL
21 24 stage/sql/init (stage) STATEMENT 20
22 22 wait/io/socket/sql/client_connection recv STAGE 21
23 23 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 21
24 24 wait/io/file/sql/query_log write STAGE 21
25 25 stage/sql/checking permissions (stage) STATEMENT 20
26 26 stage/sql/Opening tables (stage) STATEMENT 20
27 27 stage/sql/After opening tables (stage) STATEMENT 20
28 28 stage/sql/init (stage) STATEMENT 20
29 29 stage/sql/optimizing (stage) STATEMENT 20
30 30 stage/sql/executing (stage) STATEMENT 20
31 31 stage/sql/end (stage) STATEMENT 20
32 32 stage/sql/query end (stage) STATEMENT 20
33 33 stage/sql/closing tables (stage) STATEMENT 20
34 34 stage/sql/freeing items (stage) STATEMENT 20
35 35 wait/io/socket/sql/client_connection send STATEMENT 20
36 36 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 20
37 38 stage/sql/cleaning up (stage) STATEMENT 20
38 38 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 37
39 39 idle idle NULL NULL
40 58 statement/sql/select select "This is simple statement two" as payload NULL NULL
41 44 stage/sql/init (stage) STATEMENT 40
42 42 wait/io/socket/sql/client_connection recv STAGE 41
43 43 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 41
44 44 wait/io/file/sql/query_log write STAGE 41
45 45 stage/sql/checking permissions (stage) STATEMENT 40
46 46 stage/sql/Opening tables (stage) STATEMENT 40
47 47 stage/sql/After opening tables (stage) STATEMENT 40
48 48 stage/sql/init (stage) STATEMENT 40
49 49 stage/sql/optimizing (stage) STATEMENT 40
50 50 stage/sql/executing (stage) STATEMENT 40
51 51 stage/sql/end (stage) STATEMENT 40
52 52 stage/sql/query end (stage) STATEMENT 40
53 53 stage/sql/closing tables (stage) STATEMENT 40
54 54 stage/sql/freeing items (stage) STATEMENT 40
55 55 wait/io/socket/sql/client_connection send STATEMENT 40
56 56 wait/synch/mutex/sql/THD::LOCK_thd_data lock STATEMENT 40
57 58 stage/sql/cleaning up (stage) STATEMENT 40
58 58 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 57
59 59 idle idle NULL NULL
60 76 statement/sql/select select "This is the first part of a multi query" as payload;
>>>>>>> 258e16fa2de... WIP 5.7 P_S
select "And this is the second part of a multi query" as payload;
select "With a third part to make things complete" as payload NULL NULL
67 71 stage/sql/Init (stage) STATEMENT 66
67 71 stage/sql/starting (stage) STATEMENT 66
68 68 wait/io/socket/sql/client_connection recv STAGE 67
69 69 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 67
70 70 wait/io/file/sql/query_log write STAGE 67
71 71 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 67
72 72 stage/sql/Checking permissions (stage) STATEMENT 66
72 72 stage/sql/checking permissions (stage) STATEMENT 66
73 73 stage/sql/Opening tables (stage) STATEMENT 66
74 74 stage/sql/After opening tables (stage) STATEMENT 66
75 75 stage/sql/Init (stage) STATEMENT 66
75 75 stage/sql/init (stage) STATEMENT 66
76 76 stage/sql/Optimizing (stage) STATEMENT 66
77 77 stage/sql/Executing (stage) STATEMENT 66
78 78 stage/sql/End of update loop (stage) STATEMENT 66
79 79 stage/sql/Query end (stage) STATEMENT 66
80 80 stage/sql/Commit (stage) STATEMENT 66
81 81 stage/sql/Closing tables (stage) STATEMENT 66
81 81 stage/sql/closing tables (stage) STATEMENT 66
82 82 stage/sql/Starting cleanup (stage) STATEMENT 66
83 85 stage/sql/Freeing items (stage) STATEMENT 66
84 84 wait/io/socket/sql/client_connection send STAGE 83
85 85 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 83
86 103 statement/sql/select select "And this is the second part of a multi query" as payload;
select "With a third part to make things complete" as payload NULL NULL
87 89 stage/sql/Init (stage) STATEMENT 86
87 89 stage/sql/starting (stage) STATEMENT 86
88 88 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 87
89 89 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 87
90 90 stage/sql/Checking permissions (stage) STATEMENT 86
90 90 stage/sql/checking permissions (stage) STATEMENT 86
91 91 stage/sql/Opening tables (stage) STATEMENT 86
92 92 stage/sql/After opening tables (stage) STATEMENT 86
93 93 stage/sql/Init (stage) STATEMENT 86
93 93 stage/sql/init (stage) STATEMENT 86
94 94 stage/sql/Optimizing (stage) STATEMENT 86
95 95 stage/sql/Executing (stage) STATEMENT 86
96 96 stage/sql/End of update loop (stage) STATEMENT 86
97 97 stage/sql/Query end (stage) STATEMENT 86
98 98 stage/sql/Commit (stage) STATEMENT 86
99 99 stage/sql/Closing tables (stage) STATEMENT 86
99 99 stage/sql/closing tables (stage) STATEMENT 86
100 100 stage/sql/Starting cleanup (stage) STATEMENT 86
101 103 stage/sql/Freeing items (stage) STATEMENT 86
102 102 wait/io/socket/sql/client_connection send STAGE 101
103 103 wait/synch/mutex/sql/THD::LOCK_thd_kill lock STAGE 101
104 122 statement/sql/select select "With a third part to make things complete" as payload NULL NULL
105 106 stage/sql/Init (stage) STATEMENT 104
105 106 stage/sql/starting (stage) STATEMENT 104
106 106 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 105
107 107 stage/sql/Checking permissions (stage) STATEMENT 104
107 107 stage/sql/checking permissions (stage) STATEMENT 104
108 108 stage/sql/Opening tables (stage) STATEMENT 104
109 109 stage/sql/After opening tables (stage) STATEMENT 104
110 110 stage/sql/Init (stage) STATEMENT 104
110 110 stage/sql/init (stage) STATEMENT 104
111 111 stage/sql/Optimizing (stage) STATEMENT 104
112 112 stage/sql/Executing (stage) STATEMENT 104
113 113 stage/sql/End of update loop (stage) STATEMENT 104
114 114 stage/sql/Query end (stage) STATEMENT 104
115 115 stage/sql/Commit (stage) STATEMENT 104
116 116 stage/sql/Closing tables (stage) STATEMENT 104
116 116 stage/sql/closing tables (stage) STATEMENT 104
117 117 stage/sql/Starting cleanup (stage) STATEMENT 104
118 118 stage/sql/Freeing items (stage) STATEMENT 104
119 119 wait/io/socket/sql/client_connection send STATEMENT 104
@@ -325,20 +242,20 @@ select "With a third part to make things complete" as payload NULL NULL
122 122 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 121
123 123 idle idle NULL NULL
124 144 statement/sql/select select "MARKER_END" as marker NULL NULL
125 128 stage/sql/Init (stage) STATEMENT 124
125 128 stage/sql/starting (stage) STATEMENT 124
126 126 wait/io/socket/sql/client_connection recv STAGE 125
127 127 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 125
128 128 wait/io/file/sql/query_log write STAGE 125
129 129 stage/sql/Checking permissions (stage) STATEMENT 124
129 129 stage/sql/checking permissions (stage) STATEMENT 124
130 130 stage/sql/Opening tables (stage) STATEMENT 124
131 131 stage/sql/After opening tables (stage) STATEMENT 124
132 132 stage/sql/Init (stage) STATEMENT 124
132 132 stage/sql/init (stage) STATEMENT 124
133 133 stage/sql/Optimizing (stage) STATEMENT 124
134 134 stage/sql/Executing (stage) STATEMENT 124
135 135 stage/sql/End of update loop (stage) STATEMENT 124
136 136 stage/sql/Query end (stage) STATEMENT 124
137 137 stage/sql/Commit (stage) STATEMENT 124
138 138 stage/sql/Closing tables (stage) STATEMENT 124
138 138 stage/sql/closing tables (stage) STATEMENT 124
139 139 stage/sql/Starting cleanup (stage) STATEMENT 124
140 140 stage/sql/Freeing items (stage) STATEMENT 124
141 141 wait/io/socket/sql/client_connection send STATEMENT 124
@@ -346,120 +263,3 @@ select "With a third part to make things complete" as payload NULL NULL
143 144 stage/sql/Reset for next command (stage) STATEMENT 124
144 144 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 143
disconnect con1;
=======
14 15 stage/sql/freeing items (stage) STATEMENT 0
15 15 wait/io/socket/sql/client_connection send STAGE 14
16 17 stage/sql/cleaning up (stage) STATEMENT 0
17 17 wait/synch/mutex/sql/THD::LOCK_thd_query lock STAGE 16
18 18 idle idle NULL NULL
19 36 statement/sql/select select "This is simple statement one" as payload NULL NULL
20 24 stage/sql/starting (stage) STATEMENT 19
21 21 wait/io/socket/sql/client_connection recv STAGE 20
22 22 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 20
23 23 wait/synch/mutex/sql/THD::LOCK_thd_query lock STAGE 20
24 24 wait/io/file/sql/query_log write STAGE 20
25 25 stage/sql/checking permissions (stage) STATEMENT 19
26 26 stage/sql/Opening tables (stage) STATEMENT 19
27 27 stage/sql/init (stage) STATEMENT 19
28 28 stage/sql/optimizing (stage) STATEMENT 19
29 29 stage/sql/executing (stage) STATEMENT 19
30 30 stage/sql/end (stage) STATEMENT 19
31 31 stage/sql/query end (stage) STATEMENT 19
32 32 stage/sql/closing tables (stage) STATEMENT 19
33 34 stage/sql/freeing items (stage) STATEMENT 19
34 34 wait/io/socket/sql/client_connection send STAGE 33
35 36 stage/sql/cleaning up (stage) STATEMENT 19
36 36 wait/synch/mutex/sql/THD::LOCK_thd_query lock STAGE 35
37 37 idle idle NULL NULL
38 55 statement/sql/select select "This is simple statement two" as payload NULL NULL
39 43 stage/sql/starting (stage) STATEMENT 38
40 40 wait/io/socket/sql/client_connection recv STAGE 39
41 41 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 39
42 42 wait/synch/mutex/sql/THD::LOCK_thd_query lock STAGE 39
43 43 wait/io/file/sql/query_log write STAGE 39
44 44 stage/sql/checking permissions (stage) STATEMENT 38
45 45 stage/sql/Opening tables (stage) STATEMENT 38
46 46 stage/sql/init (stage) STATEMENT 38
47 47 stage/sql/optimizing (stage) STATEMENT 38
48 48 stage/sql/executing (stage) STATEMENT 38
49 49 stage/sql/end (stage) STATEMENT 38
50 50 stage/sql/query end (stage) STATEMENT 38
51 51 stage/sql/closing tables (stage) STATEMENT 38
52 53 stage/sql/freeing items (stage) STATEMENT 38
53 53 wait/io/socket/sql/client_connection send STAGE 52
54 55 stage/sql/cleaning up (stage) STATEMENT 38
55 55 wait/synch/mutex/sql/THD::LOCK_thd_query lock STAGE 54
56 56 idle idle NULL NULL
57 73 statement/sql/select select "This is the first part of a multi query" as payload;
select "And this is the second part of a multi query" as payload;
select "With a third part to make things complete" as payload NULL NULL
58 63 stage/sql/starting (stage) STATEMENT 57
59 59 wait/io/socket/sql/client_connection recv STAGE 58
60 60 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 58
61 61 wait/synch/mutex/sql/THD::LOCK_thd_query lock STAGE 58
62 62 wait/io/file/sql/query_log write STAGE 58
63 63 wait/synch/mutex/sql/THD::LOCK_thd_query lock STAGE 58
64 64 stage/sql/checking permissions (stage) STATEMENT 57
65 65 stage/sql/Opening tables (stage) STATEMENT 57
66 66 stage/sql/init (stage) STATEMENT 57
67 67 stage/sql/optimizing (stage) STATEMENT 57
68 68 stage/sql/executing (stage) STATEMENT 57
69 69 stage/sql/end (stage) STATEMENT 57
70 70 stage/sql/query end (stage) STATEMENT 57
71 71 stage/sql/closing tables (stage) STATEMENT 57
72 73 stage/sql/freeing items (stage) STATEMENT 57
73 73 wait/io/socket/sql/client_connection send STAGE 72
74 89 statement/sql/select select "And this is the second part of a multi query" as payload;
select "With a third part to make things complete" as payload NULL NULL
75 79 stage/sql/starting (stage) STATEMENT 74
76 76 wait/synch/mutex/sql/THD::LOCK_thd_query lock STAGE 75
77 77 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 75
78 78 wait/io/file/sql/query_log write STAGE 75
79 79 wait/synch/mutex/sql/THD::LOCK_thd_query lock STAGE 75
80 80 stage/sql/checking permissions (stage) STATEMENT 74
81 81 stage/sql/Opening tables (stage) STATEMENT 74
82 82 stage/sql/init (stage) STATEMENT 74
83 83 stage/sql/optimizing (stage) STATEMENT 74
84 84 stage/sql/executing (stage) STATEMENT 74
85 85 stage/sql/end (stage) STATEMENT 74
86 86 stage/sql/query end (stage) STATEMENT 74
87 87 stage/sql/closing tables (stage) STATEMENT 74
88 89 stage/sql/freeing items (stage) STATEMENT 74
89 89 wait/io/socket/sql/client_connection send STAGE 88
90 106 statement/sql/select select "With a third part to make things complete" as payload NULL NULL
91 94 stage/sql/starting (stage) STATEMENT 90
92 92 wait/synch/mutex/sql/THD::LOCK_thd_query lock STAGE 91
93 93 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 91
94 94 wait/io/file/sql/query_log write STAGE 91
95 95 stage/sql/checking permissions (stage) STATEMENT 90
96 96 stage/sql/Opening tables (stage) STATEMENT 90
97 97 stage/sql/init (stage) STATEMENT 90
98 98 stage/sql/optimizing (stage) STATEMENT 90
99 99 stage/sql/executing (stage) STATEMENT 90
100 100 stage/sql/end (stage) STATEMENT 90
101 101 stage/sql/query end (stage) STATEMENT 90
102 102 stage/sql/closing tables (stage) STATEMENT 90
103 104 stage/sql/freeing items (stage) STATEMENT 90
104 104 wait/io/socket/sql/client_connection send STAGE 103
105 106 stage/sql/cleaning up (stage) STATEMENT 90
106 106 wait/synch/mutex/sql/THD::LOCK_thd_query lock STAGE 105
107 107 idle idle NULL NULL
108 125 statement/sql/select select "MARKER_END" as marker NULL NULL
109 113 stage/sql/starting (stage) STATEMENT 108
110 110 wait/io/socket/sql/client_connection recv STAGE 109
111 111 wait/synch/mutex/sql/THD::LOCK_thd_data lock STAGE 109
112 112 wait/synch/mutex/sql/THD::LOCK_thd_query lock STAGE 109
113 113 wait/io/file/sql/query_log write STAGE 109
114 114 stage/sql/checking permissions (stage) STATEMENT 108
115 115 stage/sql/Opening tables (stage) STATEMENT 108
116 116 stage/sql/init (stage) STATEMENT 108
117 117 stage/sql/optimizing (stage) STATEMENT 108
118 118 stage/sql/executing (stage) STATEMENT 108
119 119 stage/sql/end (stage) STATEMENT 108
120 120 stage/sql/query end (stage) STATEMENT 108
121 121 stage/sql/closing tables (stage) STATEMENT 108
122 123 stage/sql/freeing items (stage) STATEMENT 108
123 123 wait/io/socket/sql/client_connection send STAGE 122
124 125 stage/sql/cleaning up (stage) STATEMENT 108
125 125 wait/synch/mutex/sql/THD::LOCK_thd_query lock STAGE 124
>>>>>>> merge-perfschema-5.7

22
mysql-test/suite/perfschema/r/ortho_iter.result
View File

@@ -32,12 +32,8 @@ declare debug integer default 0;
declare pfs_cursor CURSOR FOR
select table_name from information_schema.tables
where table_schema= 'performance_schema'
<<<<<<< HEAD
and table_name like "events_%_by_event_name%"
and table_name like "%_by_event_name%"
order by table_name;
=======
and table_name like "%_by_event_name%";
>>>>>>> 258e16fa2de... WIP 5.7 P_S
declare continue handler for sqlstate '02000'
set done = 1;
select (instr_name like "wait/%") or (instr_name like "idle") into is_wait;
@@ -222,15 +218,11 @@ close pfs_cursor;
signal sqlstate '01000' set message_text='Done', mysql_errno=12000;
end
$
<<<<<<< HEAD
Warnings:
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
show variables where
`Variable_name` != "performance_schema_max_statement_classes" and
`Variable_name` like "performance_schema%";
=======
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
Warning 1287 '<select expression> INTO <destination>;' is deprecated and will be removed in a future release. Please use 'SELECT <select list> INTO <destination> FROM...' instead
show global variables like "performance_schema%";
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Variable_name Value
performance_schema ON
performance_schema_accounts_size 100
@@ -261,14 +253,10 @@ performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
<<<<<<< HEAD
performance_schema_max_stage_classes 160
=======
performance_schema_max_sql_text_length 1024
performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 193
performance_schema_max_stage_classes 160
performance_schema_max_statement_classes 222
performance_schema_max_statement_stack 10
>>>>>>> 258e16fa2de... WIP 5.7 P_S
performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500
performance_schema_max_table_lock_stat 500

128
mysql-test/suite/perfschema/r/part_table_io.result
View File

@@ -13,8 +13,6 @@ insert into marker set a = 1;
create table test.no_index_tab
( a varchar(255) not null, b int not null) engine = MyISAM
PARTITION BY KEY (b) PARTITIONS 2;
Warnings:
Warning 1287 The partition engine, used by table 'test.no_index_tab', is deprecated and will be removed in a future release. Please use native partitioning instead.
insert into marker set a = 1;
show create table test.no_index_tab;
Table Create Table
@@ -54,18 +52,13 @@ insert into marker set a = 1;
optimize table test.no_index_tab;
Table Op Msg_type Msg_text
test.no_index_tab optimize status OK
test.no_index_tab optimize warning The partition engine, used by table 'test.no_index_tab', is deprecated and will be removed in a future release. Please use native partitioning instead.
insert into marker set a = 1;
select * from test.no_index_tab;
a b
bar 1
bar 2
Warnings:
Warning 1287 The partition engine, used by table 'test.no_index_tab', is deprecated and will be removed in a future release. Please use native partitioning instead.
insert into marker set a = 1;
truncate table test.no_index_tab;
Warnings:
Warning 1287 The partition engine, used by table 'test.no_index_tab', is deprecated and will be removed in a future release. Please use native partitioning instead.
insert into marker set a = 1;
drop table test.no_index_tab;
update performance_schema.setup_consumers set enabled='NO';
@@ -80,96 +73,50 @@ where event_name like 'wait/io/table/%'
and object_schema in ("test")
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
<<<<<<< HEAD
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
show status where Variable_name like 'performance_schema_%' and
Variable_name not like 'performance_schema_%_classes_lost';
=======
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 3
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab update 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab delete 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test no_index_tab fetch 2
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 3
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab update 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test no_index_tab delete 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test no_index_tab fetch 2
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
show global status like 'performance_schema_%';
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Variable_name Value
Performance_schema_accounts_lost 0
Performance_schema_cond_classes_lost 0
Performance_schema_cond_instances_lost 0
Performance_schema_digest_lost 0
Performance_schema_file_classes_lost 0
Performance_schema_file_handles_lost 0
Performance_schema_file_instances_lost 0
Performance_schema_hosts_lost 0
Performance_schema_index_stat_lost 0
Performance_schema_locker_lost 0
<<<<<<< HEAD
Performance_schema_mutex_instances_lost 0
=======
Performance_schema_memory_classes_lost 0
Performance_schema_metadata_lock_lost 0
Performance_schema_mutex_classes_lost 0
@@ -178,17 +125,16 @@ Performance_schema_nested_statement_lost 0
Performance_schema_prepared_statements_lost 0
Performance_schema_program_lost 0
Performance_schema_rwlock_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_rwlock_instances_lost 0
Performance_schema_session_connect_attrs_lost 0
Performance_schema_socket_classes_lost 0
Performance_schema_socket_instances_lost 0
Performance_schema_stage_classes_lost 0
Performance_schema_statement_classes_lost 0
Performance_schema_table_handles_lost 0
Performance_schema_table_instances_lost 0
<<<<<<< HEAD
=======
Performance_schema_table_lock_stat_lost 0
Performance_schema_thread_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_thread_instances_lost 0
Performance_schema_users_lost 0
truncate performance_schema.events_waits_history_long;

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

@@ -4,97 +4,6 @@ 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

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

@@ -2,97 +2,6 @@
create function test.user_func() returns integer
return 0;
update mysql.proc set db='performance_schema' where name='user_func';
<<<<<<< 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_func

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

@@ -2,97 +2,6 @@
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

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

@@ -4,97 +4,6 @@ use performance_schema;
show tables like "user_table";
Tables_in_performance_schema (user_table)
user_table
<<<<<<< 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
show tables like "user_table";
Tables_in_performance_schema (user_table)
user_table

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

@@ -4,97 +4,6 @@ use performance_schema;
show tables like "user_view";
Tables_in_performance_schema (user_view)
user_view
<<<<<<< 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
show tables like "user_view";
Tables_in_performance_schema (user_view)
user_view

21
mysql-test/suite/perfschema/r/prepared_statements.result
View File

@@ -57,7 +57,7 @@ OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st1 FROM ...
SQL_TEXT PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse'
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
@@ -77,12 +77,13 @@ OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st3 FROM ...
SQL_TEXT PREPARE st3 FROM 'INSERT INTO t1 SELECT * FROM t1 WHERE a<=?'
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st4 FROM ...
SQL_TEXT PREPARE st4 FROM
'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a'
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
@@ -163,7 +164,7 @@ OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st1 FROM ...
SQL_TEXT PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse'
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
@@ -183,12 +184,13 @@ OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st3 FROM ...
SQL_TEXT PREPARE st3 FROM 'INSERT INTO t1 SELECT * FROM t1 WHERE a<=?'
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st4 FROM ...
SQL_TEXT PREPARE st4 FROM
'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a'
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
@@ -295,7 +297,7 @@ OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st1 FROM ...
SQL_TEXT PREPARE st1 FROM 'SELECT SQRT(POW(?,2) + POW(?,2)) AS hypotenuse'
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
@@ -315,12 +317,13 @@ OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st3 FROM ...
SQL_TEXT PREPARE st3 FROM 'INSERT INTO t1 SELECT * FROM t1 WHERE a<=?'
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL
EVENT_NAME statement/sql/prepare_sql
SQL_TEXT PREPARE st4 FROM ...
SQL_TEXT PREPARE st4 FROM
'(SELECT a FROM t1) UNION (SELECT a+10 FROM t1) ORDER BY RAND()*0+a'
OBJECT_TYPE NULL
OBJECT_SCHEMA NULL
OBJECT_NAME NULL

2
mysql-test/suite/perfschema/r/prepared_stmts_by_stored_programs.result
View File

@@ -8,8 +8,6 @@ b CHAR(10),
name CHAR(10)
);
SET sql_mode = 'NO_ENGINE_SUBSTITUTION';
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
INSERT INTO t VALUES (1,"kuchipudi","Vempati");
INSERT INTO t VALUES (2,"odissi","Mohapatra");
INSERT INTO t VALUES (3,"kathak","Maharaj");

23
mysql-test/suite/perfschema/r/privilege.result
View File

@@ -1,7 +1,3 @@
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
show grants;
Grants for root@localhost
GRANT ALL PRIVILEGES ON *.* TO `root`@`localhost` WITH GRANT OPTION
@@ -10,14 +6,10 @@ create user 'pfs_user_1'@localhost;
create user 'pfs_user_2'@localhost;
create user 'pfs_user_3'@localhost;
grant ALL on *.* to 'pfs_user_1'@localhost with GRANT OPTION;
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
grant ALL on performance_schema.* to 'pfs_user_2'@localhost
with GRANT OPTION;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant CREATE on performance_schema.* to 'pfs_user_2'@localhost;
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
grant DROP on performance_schema.* to 'pfs_user_2'@localhost;
grant REFERENCES on performance_schema.* to 'pfs_user_2'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
@@ -50,8 +42,6 @@ grant ALL on performance_schema.setup_instruments to 'pfs_user_3'@localhost
with GRANT OPTION;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
grant CREATE on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
grant DROP on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
grant REFERENCES on performance_schema.setup_instruments to 'pfs_user_3'@localhost;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
@@ -591,6 +581,8 @@ WHERE name LIKE 'wait/synch/mutex/%'
OR name LIKE 'wait/synch/rwlock/%';
UPDATE performance_schema.setup_consumers SET enabled = 'YES';
UPDATE performance_schema.setup_timers SET timer_name = 'TICK' WHERE name <> "wait";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
TRUNCATE TABLE performance_schema.events_waits_history_long;
TRUNCATE TABLE performance_schema.events_waits_history;
TRUNCATE TABLE performance_schema.events_waits_current;
@@ -603,11 +595,14 @@ flush privileges;
UPDATE performance_schema.setup_instruments SET enabled = 'YES', timed = 'YES';
UPDATE performance_schema.setup_consumers SET enabled = 'YES';
UPDATE performance_schema.setup_timers SET timer_name = 'MICROSECOND' where name="idle";
UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND' where name="stage";
UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND' where name="statement";
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND' where name="stage";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
UPDATE performance_schema.setup_timers SET timer_name = 'NANOSECOND' where name="statement";
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
#
# WL#2284: Increase the length of a user name
#

98
mysql-test/suite/perfschema/r/privilege_table_io.result
View File

@@ -55,14 +55,10 @@ performance_schema_max_rwlock_classes 50
performance_schema_max_rwlock_instances 5000
performance_schema_max_socket_classes 10
performance_schema_max_socket_instances 1000
<<<<<<< HEAD
performance_schema_max_stage_classes 160
=======
performance_schema_max_sql_text_length 1024
performance_schema_max_stage_classes 150
performance_schema_max_statement_classes 193
performance_schema_max_stage_classes 160
performance_schema_max_statement_classes 222
performance_schema_max_statement_stack 10
>>>>>>> 258e16fa2de... WIP 5.7 P_S
performance_schema_max_table_handles 1000
performance_schema_max_table_instances 500
performance_schema_max_table_lock_stat 500
@@ -116,77 +112,38 @@ where event_name like 'wait/io/table/%'
and object_schema in ("test", "mysql")
order by thread_id, event_id;
event_name short_source object_type object_schema pretty_name operation number_of_bytes
<<<<<<< HEAD
wait/io/table/sql/handler handler.cc: TABLE mysql global_priv fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql global_priv fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql global_priv fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql global_priv fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql global_priv fetch NULL
=======
<<<<<<< HEAD
wait/io/table/sql/handler handler.cc: TABLE mysql host fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch NULL
>>>>>>> 258e16fa2de... WIP 5.7 P_S
wait/io/table/sql/handler handler.cc: TABLE mysql db fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql db fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql db fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql proxies_priv fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql proxies_priv fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql proxies_priv fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql roles_mapping fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql tables_priv fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql procs_priv fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql servers fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql table_stats fetch NULL
wait/io/table/sql/handler handler.cc: TABLE mysql column_stats fetch NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
wait/io/table/sql/handler handler.cc: TABLE test marker insert NULL
<<<<<<< HEAD
show status where Variable_name like 'performance_schema_%' and
Variable_name not like 'performance_schema_%_classes_lost';
=======
show status like 'performance_schema_%';
=======
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql user fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql db fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql db fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql db fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql db fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql proxies_priv fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql proxies_priv fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql proxies_priv fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql tables_priv fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql tables_priv fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql procs_priv fetch 1
wait/io/table/sql/handler handler.cc: TABLE mysql servers fetch 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler handler.cc: TABLE test marker insert 1
wait/io/table/sql/handler TABLE mysql global_priv fetch 1
wait/io/table/sql/handler TABLE mysql global_priv fetch 1
wait/io/table/sql/handler TABLE mysql global_priv fetch 1
wait/io/table/sql/handler TABLE mysql global_priv fetch 1
wait/io/table/sql/handler TABLE mysql global_priv fetch 1
wait/io/table/sql/handler TABLE mysql db fetch 1
wait/io/table/sql/handler TABLE mysql db fetch 1
wait/io/table/sql/handler TABLE mysql db fetch 1
wait/io/table/sql/handler TABLE mysql proxies_priv fetch 1
wait/io/table/sql/handler TABLE mysql proxies_priv fetch 1
wait/io/table/sql/handler TABLE mysql proxies_priv fetch 1
wait/io/table/sql/handler TABLE mysql roles_mapping fetch 1
wait/io/table/sql/handler TABLE mysql tables_priv fetch 1
wait/io/table/sql/handler TABLE mysql procs_priv fetch 1
wait/io/table/sql/handler TABLE mysql servers fetch 1
wait/io/table/sql/handler TABLE mysql table_stats fetch 1
wait/io/table/sql/handler TABLE mysql column_stats fetch 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
wait/io/table/sql/handler TABLE test marker insert 1
show global status like 'performance_schema_%';
>>>>>>> merge-perfschema-5.7
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Variable_name Value
Performance_schema_accounts_lost 0
Performance_schema_cond_classes_lost 0
Performance_schema_cond_instances_lost 0
Performance_schema_digest_lost 0
Performance_schema_file_classes_lost 0
Performance_schema_file_handles_lost 0
Performance_schema_file_instances_lost 0
Performance_schema_hosts_lost 0
Performance_schema_index_stat_lost 0
Performance_schema_locker_lost 0
<<<<<<< HEAD
Performance_schema_mutex_instances_lost 0
=======
Performance_schema_memory_classes_lost 0
Performance_schema_metadata_lock_lost 0
Performance_schema_mutex_classes_lost 0
@@ -195,17 +152,16 @@ Performance_schema_nested_statement_lost 0
Performance_schema_prepared_statements_lost 0
Performance_schema_program_lost 0
Performance_schema_rwlock_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_rwlock_instances_lost 0
Performance_schema_session_connect_attrs_lost 0
Performance_schema_socket_classes_lost 0
Performance_schema_socket_instances_lost 0
Performance_schema_stage_classes_lost 0
Performance_schema_statement_classes_lost 0
Performance_schema_table_handles_lost 0
Performance_schema_table_instances_lost 0
<<<<<<< HEAD
=======
Performance_schema_table_lock_stat_lost 0
Performance_schema_thread_classes_lost 0
>>>>>>> 258e16fa2de... WIP 5.7 P_S
Performance_schema_thread_instances_lost 0
Performance_schema_users_lost 0
truncate performance_schema.events_waits_history_long;

10
mysql-test/suite/perfschema/r/query_cache.result
View File

@@ -3,14 +3,8 @@ drop table if exists t1;
create table t1 (a int not null);
insert into t1 values (1), (2), (3);
SET GLOBAL query_cache_size=1355776;
Warnings:
Warning 1287 '@@query_cache_size' is deprecated and will be removed in a future release.
flush query cache;
Warnings:
Warning 1681 'FLUSH QUERY CACHE' is deprecated and will be removed in a future release.
reset query cache;
Warnings:
Warning 1681 'RESET QUERY CACHE' is deprecated and will be removed in a future release.
flush status;
select * from t1;
a
@@ -47,7 +41,7 @@ select * from performance_schema.setup_timers where name='wait';
NAME TIMER_NAME
wait {CYCLE_OR_NANOSECOND}
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
show global status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 1
@@ -64,7 +58,7 @@ select * from performance_schema.setup_timers where name='wait';
NAME TIMER_NAME
wait {CYCLE_OR_NANOSECOND}
Warnings:
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release.
Warning 1681 'performance_schema.setup_timers' is deprecated and will be removed in a future release
show global status like "Qcache_queries_in_cache";
Variable_name Value
Qcache_queries_in_cache 1

30
mysql-test/suite/perfschema/r/read_only.result
View File

@@ -1,19 +1,7 @@
use performance_schema;
set @start_read_only= @@global.read_only;
<<<<<<< HEAD
create user pfsuser@localhost;
=======
set @orig_sql_mode= @@sql_mode;
set sql_mode= (select replace(@@sql_mode,'NO_AUTO_CREATE_USER',''));
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
>>>>>>> merge-perfschema-5.7
grant SELECT, UPDATE on performance_schema.* to pfsuser@localhost;
Warnings:
Warning 1287 Using GRANT for creating new user is deprecated and will be removed in future release. Create new user with CREATE USER statement.
set sql_mode= @orig_sql_mode;
Warnings:
Warning 3090 Changing sql mode 'NO_AUTO_CREATE_USER' is deprecated. It will be removed in a future release.
flush privileges;
connect con1, localhost, pfsuser, , test;
connection default;
@@ -26,6 +14,7 @@ show grants;
Grants for pfsuser@localhost
GRANT USAGE ON *.* TO `pfsuser`@`localhost`
GRANT SELECT, UPDATE ON `performance_schema`.* TO `pfsuser`@`localhost`
# Update on perf_schema is allowed in read_only mode.
select * from performance_schema.setup_instruments;
update performance_schema.setup_instruments set enabled='NO';
update performance_schema.setup_instruments set enabled='YES';
@@ -59,23 +48,6 @@ update performance_schema.setup_instruments set enabled='NO';
update performance_schema.setup_instruments set enabled='YES';
disconnect con1;
connection default;
set global super_read_only=1;
connection con1;
select @@global.super_read_only;
@@global.super_read_only
1
show grants;
Grants for pfsuser@localhost
GRANT SUPER ON *.* TO 'pfsuser'@'localhost'
GRANT SELECT, UPDATE ON `performance_schema`.* TO 'pfsuser'@'localhost'
select * from performance_schema.setup_instruments;
# Update is allowed in super_read_only on perf schema for
# super user.
update performance_schema.setup_instruments set enabled='NO';
update performance_schema.setup_instruments set enabled='YES';
disconnect con1;
connection default;
set global read_only= @start_read_only;
set global super_read_only= @start_super_read_only;
drop user pfsuser@localhost;
flush privileges;

Some files were not shown because too many files have changed in this diff Show More