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

Merge branch 'merge-perfschema-5.7' into 10.5

Browse Source
This commit is contained in:
Oleksandr Byelkin
2022-08-02 09:34:15 +02:00
parent 4d0c53a327 61d08f7427
commit b043e1098e
308 changed files with 4683 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/mysql/psi/mysql_file.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
include/mysql/psi/mysql_idle.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2011, 2021, Oracle and/or its affiliates
/* Copyright (c) 2011, 2022, Oracle and/or its affiliates
Copyright (c) 2017, 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify

2
include/mysql/psi/mysql_mdl.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2012, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2012, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
include/mysql/psi/mysql_memory.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2012, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2012, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
include/mysql/psi/mysql_ps.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2014, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2014, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
include/mysql/psi/mysql_socket.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
Copyright (c) 2017, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify

2
include/mysql/psi/mysql_sp.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2013, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2013, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
include/mysql/psi/mysql_stage.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
include/mysql/psi/mysql_statement.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
Copyright (c) 2017, 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify

9
include/mysql/psi/mysql_thread.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
Copyright (c) 2020, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
@ -1339,6 +1339,13 @@ static inline void inline_mysql_thread_set_psi_THD(THD *thd)
}
#endif /* __cplusplus */
static inline void mysql_thread_set_peer_port(uint port __attribute__ ((unused))) {
#ifdef HAVE_PSI_THREAD_INTERFACE
struct PSI_thread *psi = PSI_THREAD_CALL(get_thread)();
PSI_THREAD_CALL(set_thread_peer_port)(psi, port);
#endif
}
#endif
#endif /* DISABLE_MYSQL_THREAD_H */

2
include/mysql/psi/mysql_transaction.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2013, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2013, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

13
include/mysql/psi/psi.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,
@ -1692,6 +1692,15 @@ typedef void (*set_thread_info_v1_t)(const char* info, uint info_len);
*/
typedef void (*set_thread_v1_t)(struct PSI_thread *thread);
/**
Assign the remote (peer) port to the instrumented thread.
@param thread pointer to the thread instrumentation
@param port the remote port
*/
typedef void (*set_thread_peer_port_v1_t)(PSI_thread *thread,
unsigned int port);
/** Delete the current thread instrumentation. */
typedef void (*delete_current_thread_v1_t)(void);
@ -2737,6 +2746,8 @@ struct PSI_v1
start_metadata_wait_v1_t start_metadata_wait;
end_metadata_wait_v1_t end_metadata_wait;
set_thread_peer_port_v1_t set_thread_peer_port;
};
/** @} (end of group Group_PSI_v1) */

2
include/mysql/psi/psi_abi_v0.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2011, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2011, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
include/mysql/psi/psi_abi_v1.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

3
include/mysql/psi/psi_abi_v1.h.pp
View File

@ -459,6 +459,8 @@ typedef void (*set_thread_start_time_v1_t)(time_t start_time);
typedef void (*set_thread_state_v1_t)(const char* state);
typedef void (*set_thread_info_v1_t)(const char* info, uint info_len);
typedef void (*set_thread_v1_t)(struct PSI_thread *thread);
typedef void (*set_thread_peer_port_v1_t)(PSI_thread *thread,
unsigned int port);
typedef void (*delete_current_thread_v1_t)(void);
typedef void (*delete_thread_v1_t)(struct PSI_thread *thread);
typedef struct PSI_file_locker* (*get_thread_file_name_locker_v1_t)
@ -829,6 +831,7 @@ struct PSI_v1
destroy_metadata_lock_v1_t destroy_metadata_lock;
start_metadata_wait_v1_t start_metadata_wait;
end_metadata_wait_v1_t end_metadata_wait;
set_thread_peer_port_v1_t set_thread_peer_port;
};
typedef struct PSI_v1 PSI;
typedef struct PSI_mutex_info_v1 PSI_mutex_info;

2
include/mysql/psi/psi_abi_v2.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

8
include/mysql/psi/psi_base.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,
@ -94,6 +94,12 @@ extern "C" {
*/
#define PSI_FLAG_VOLATILITY_SESSION (1 << 6)
/**
System thread flag.
Indicates that the instrumented object exists on a system thread.
*/
#define PSI_FLAG_THREAD_SYSTEM (1 << 9)
#ifdef HAVE_PSI_INTERFACE
/**

2
include/mysql/psi/psi_memory.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2013, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2013, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
include/pfs_thread_provider.h
View File

@ -99,6 +99,8 @@ void pfs_set_thread_info_v1(const char* info, uint info_len);
void pfs_set_thread_v1(PSI_thread* thread);
void pfs_set_thread_peer_port_v1(PSI_thread *thread, uint port);
void pfs_delete_current_thread_v1(void);
void pfs_delete_thread_v1(PSI_thread *thread);

36
mysql-test/include/have_query_cache_disabled.inc Normal file
View File

@ -0,0 +1,36 @@
# Skip the test if 'query cache' is disabled.
# Note : There are 2 techniques to disable query cache :
# (1) Set query_cache_type to 0 or OFF
# (2) Set query_cache_size to 0
disable_query_log;
let $do_skip=0;
let $qc_var_1= query_get_value("SELECT COUNT(*) AS var1 FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME = 'have_query_cache' AND variable_value = 'YES'", var1, 1);
if ($qc_var_1 == 1)
{
let $do_skip=1;
}
# Check if 'query_cache_type' is OFF
let $qc_var_2= query_get_value("SELECT COUNT(*) AS var2 FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME = 'query_cache_type' AND VARIABLE_VALUE = 'OFF'", var2, 1);
if ($qc_var_2 == 1)
{
let $do_skip=0;
}
# Check if 'query_cache_size' is 0
let $qc_var_3= query_get_value("SELECT COUNT(*) AS var3 FROM INFORMATION_SCHEMA.SESSION_VARIABLES WHERE VARIABLE_NAME = 'query_cache_size' AND VARIABLE_VALUE = 0", var3, 1);
if ($qc_var_3 == 1)
{
let $do_skip=0;
}
if ($do_skip)
{
skip Query Cache enabled, skipping test;
}
enable_query_log;

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

@ -55,3 +55,13 @@ show_misc: todo
show_plugin: todo
status_reprepare:why P_S filters out Com_* variables?
processlist: todo
processlist_acl: todo
processlist_port: todo
processlist_no_pfs: todo
ddl_processlist: todo
dml_processlist: todo
processlist_57: todo
processlist_anonymous: todo
processlist_reg_user: todo

39
mysql-test/suite/perfschema/include/processlist_load.inc Normal file
View File

@ -0,0 +1,39 @@
# ../include/processlist_load.inc
#
# SUMMARY
#
# Execute PROCESSLIST queries, sorted by user
#
# USAGE
#
# Example: Using processlist_set.inc to set @@global.performance_schema_show_processlist
#
# let $pfs_spl = on/off
# --source ../include/processlist_set.inc
# --source ../include/processlist_load.inc
#
# Columns
# 1 <Id> 2 <User> 3 <Host> 4 <db> 5 <Command> 6 <Time> 7 <State> 8 <Info>
# Sort SHOW PROCESSLIST by User instead of Id because Id is not zero-padded
# Unique usernames give best results
--echo
--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
--replace_regex /Daemon/<Command>/ /Connect/<Command>/ /Sleep/<Command>/
--sorted_result
SHOW FULL PROCESSLIST;
--echo
--echo # Performance Schema processlist table
--echo
--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
--replace_regex /Daemon/<Command>/ /Connect/<Command>/ /Sleep/<Command>/
select * from performance_schema.processlist order by user, id;
--echo
--echo # Information Schema processlist table
--echo
--replace_column 1 <Id> 3 <Host> 6 <Time> 7 <State>
--replace_regex /Daemon/<Command>/ /Connect/<Command>/ /Sleep/<Command>/
select * from information_schema.processlist order by user, id;

17
mysql-test/suite/perfschema/include/processlist_set.inc Normal file
View File

@ -0,0 +1,17 @@
# ../include/processlist_set.inc
#
# SUMMARY
#
# Set the value of performance_schema_show_proceslist then
# wait for the operation to complete
#
# USAGE
#
# let $pfs_spl = on;
# --source ../include/processlist_set.inc
eval set @@global.performance_schema_show_processlist = $pfs_spl;
let $wait_condition = show variables where variable_name like '%show_processlist%' and value = '$pfs_spl';
--source include/wait_condition.inc

20
mysql-test/suite/perfschema/r/ddl_processlist.result Normal file
View File

@ -0,0 +1,20 @@
select @@global.performance_schema_show_processlist into @save_processlist;
set @@global.performance_schema_show_processlist = 'on';
alter table performance_schema.processlist
add column foo integer;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
truncate table performance_schema.processlist;
ERROR HY000: Invalid performance_schema usage.
alter table performance_schema.processlist
add index test_index(info);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
create unique index test_index
on performance_schema.processlist(host);
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
drop index `PRIMARY`
on performance_schema.processlist;
ERROR 42000: Access denied for user 'root'@'localhost' to database 'performance_schema'
CREATE TABLE test.create_select
AS SELECT * from performance_schema.processlist;
DROP TABLE test.create_select;
set @@global.performance_schema_show_processlist = @save_processlist;

24
mysql-test/suite/perfschema/r/dml_processlist.result Normal file
View File

@ -0,0 +1,24 @@
select @@global.performance_schema_show_processlist into @save_processlist;
set @@global.performance_schema_show_processlist = 'on';
select * from performance_schema.processlist
where user like 'event_scheduler';
select * from performance_schema.processlist
where user = 'FOO';
insert into performance_schema.processlist
values (12, 'foo', 'bar', 'test', null, 1000, 'state', 'info');
ERROR 42000: INSERT command denied to user 'root'@'localhost' for table 'processlist'
update performance_schema.processlist
set id=12, user='foo';
ERROR 42000: UPDATE command denied to user 'root'@'localhost' for table 'processlist'
delete from performance_schema.processlist
where id <> 99;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'processlist'
delete from performance_schema.processlist;
ERROR 42000: DELETE command denied to user 'root'@'localhost' for table 'processlist'
LOCK TABLES performance_schema.processlist READ;
ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'processlist'
UNLOCK TABLES;
LOCK TABLES performance_schema.processlist WRITE;
ERROR 42000: SELECT, LOCK TABLES command denied to user 'root'@'localhost' for table 'processlist'
UNLOCK TABLES;
set @@global.performance_schema_show_processlist = @save_processlist;

106
mysql-test/suite/perfschema/r/misc_global_status.result Normal file
View File

@ -0,0 +1,106 @@
CREATE USER user1@localhost;
CREATE USER user2@localhost;
CREATE USER user3@localhost;
grant ALL on *.* to user1@localhost;
grant ALL on *.* to user2@localhost;
grant ALL on *.* to user3@localhost;
TRUNCATE TABLE performance_schema.accounts;
FLUSH PRIVILEGES;
CREATE TABLE test.t_range(a int, b int, PRIMARY KEY(a));
INSERT INTO test.t_range values (1, 1), (2,2), (3, 3), (4, 4), (5, 5);
INSERT INTO test.t_range values (6, 6), (7,7), (8, 8), (9, 9), (10, 10);
FLUSH STATUS;
SELECT * from test.t_range where (a >= 3) AND (a <= 5);
a b
3 3
4 4
5 5
SELECT * from performance_schema.session_status
WHERE VARIABLE_NAME = 'Select_range';
VARIABLE_NAME VARIABLE_VALUE
Select_range 1
VARIABLE_NAME DELTA
Select_range 1
connect con1, localhost, user1,,;
SELECT * from test.t_range where (a >= 3) AND (a <= 5);
a b
3 3
4 4
5 5
SELECT * from performance_schema.session_status
WHERE VARIABLE_NAME = 'Select_range';
VARIABLE_NAME VARIABLE_VALUE
Select_range 1
VARIABLE_NAME DELTA
Select_range 2
connect con2, localhost, user2,,;
SELECT * from test.t_range where (a >= 3) AND (a <= 5);
a b
3 3
4 4
5 5
SELECT * from test.t_range where (a >= 4) AND (a <= 6);
a b
4 4
5 5
6 6
SELECT * from performance_schema.session_status
WHERE VARIABLE_NAME = 'Select_range';
VARIABLE_NAME VARIABLE_VALUE
Select_range 2
VARIABLE_NAME DELTA
Select_range 4
connect con3, localhost, user3,,;
SELECT * from test.t_range where (a >= 3) AND (a <= 5);
a b
3 3
4 4
5 5
SELECT * from test.t_range where (a >= 4) AND (a <= 6);
a b
4 4
5 5
6 6
SELECT * from test.t_range where (a >= 5) AND (a <= 7);
a b
5 5
6 6
7 7
SELECT * from performance_schema.session_status
WHERE VARIABLE_NAME = 'Select_range';
VARIABLE_NAME VARIABLE_VALUE
Select_range 3
VARIABLE_NAME DELTA
Select_range 7
connection default;
VARIABLE_NAME DELTA
Select_range 7
SELECT `USER`, `HOST`, VARIABLE_NAME, VARIABLE_VALUE
FROM performance_schema.status_by_account WHERE VARIABLE_NAME = 'Select_range'
AND `USER` LIKE 'user%'
ORDER BY `USER`;
USER HOST VARIABLE_NAME VARIABLE_VALUE
user1 localhost Select_range 1
user2 localhost Select_range 2
user3 localhost Select_range 3
disconnect con1;
disconnect con2;
VARIABLE_NAME DELTA
Select_range 7
TRUNCATE TABLE performance_schema.accounts;
VARIABLE_NAME DELTA
Select_range 7
disconnect con3;
VARIABLE_NAME DELTA
Select_range 7
TRUNCATE TABLE performance_schema.accounts;
VARIABLE_NAME DELTA
Select_range 7
DROP TABLE test.t_range;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1@localhost;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user2@localhost;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user3@localhost;
DROP USER user1@localhost;
DROP USER user2@localhost;
DROP USER user3@localhost;
FLUSH PRIVILEGES;

201
mysql-test/suite/perfschema/r/processlist.result Normal file
View File

@ -0,0 +1,201 @@
##
## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
##
## Test cases:
## 1. Execute the new SHOW [FULL] PROCESSLIST and SELECT on performance_schema.processlist
## 2. Execute the legacy SHOW [FULL] PROCESSLIST and SELECT on information_schema.processlist
## 3. Verify that performance_schema_show_processlist = ON executes the new implementation
## 4. Verify that performance_schema_show_processlist = OFF executes the legacy code path
##
## Results must be manually verified.
### Setup ###
select @@global.performance_schema_show_processlist into @save_processlist;
create user user1@localhost, user2@localhost,
user3@localhost, user4@localhost;
grant ALL on *.* to user1@localhost;
grant ALL on *.* to user2@localhost;
grant ALL on *.* to user3@localhost;
grant ALL on *.* to user4@localhost;
flush privileges;
use test;
create table test.t1 (s1 int, s2 int, s3 int, s4 int);
# Switch to (con0, localhost, root, , )
insert into test.t1 values(1, 1, 1, 1);
insert into test.t1 values(2, 2, 2, 2);
insert into test.t1 values(3, 3, 3, 3);
insert into test.t1 values(4, 4, 4, 4);
# Lock test.t1, insert/update/deletes will block
lock tables t1 read;
# Connect (con1, localhost, user1, , )
insert into test.t1 values (0, 0, 0, 0);
# Connect (con2, localhost, user2, , )
update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999;;
# Connect (con3, localhost, user3, , )
delete from test.t1 where s1 = 3;
# Connect (con4, localhost, user4, , )
insert into test.t1 values (4, 4, 4, 4);
# Connection default
# Wait for queries to appear in the processlist table
### Execute new SHOW [FULL] PROCESSLIST and SELECT on performance_schema.processlist
set @@global.performance_schema_show_processlist = on;
SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> root <Host> test Query <Time> <State> SHOW FULL PROCESSLIST
<Id> user1 <Host> test Query <Time> <State> insert into test.t1 values (0, 0, 0, 0)
<Id> user2 <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999
<Id> user3 <Host> test Query <Time> <State> delete from test.t1 where s1 = 3
<Id> user4 <Host> test Query <Time> <State> insert into test.t1 values (4, 4, 4, 4)
# Performance Schema processlist table
select * from performance_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test Query <Time> <State> select * from performance_schema.processlist order by user, id
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user1 <Host> test Query <Time> <State> insert into test.t1 values (0, 0, 0, 0)
<Id> user2 <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999
<Id> user3 <Host> test Query <Time> <State> delete from test.t1 where s1 = 3
<Id> user4 <Host> test Query <Time> <State> insert into test.t1 values (4, 4, 4, 4)
# Information Schema processlist table
select * from information_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test Query <Time> <State> select * from information_schema.processlist order by user, id
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user1 <Host> test Query <Time> <State> insert into test.t1 values (0, 0, 0, 0)
<Id> user2 <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999
<Id> user3 <Host> test Query <Time> <State> delete from test.t1 where s1 = 3
<Id> user4 <Host> test Query <Time> <State> insert into test.t1 values (4, 4, 4, 4)
### Execute legacy SHOW [FULL] PROCESSLIST and SELECT on information_schema.processlist
set @@global.performance_schema_show_processlist = off;
SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> root <Host> test Query <Time> <State> SHOW FULL PROCESSLIST
<Id> user1 <Host> test Query <Time> <State> insert into test.t1 values (0, 0, 0, 0)
<Id> user2 <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999
<Id> user3 <Host> test Query <Time> <State> delete from test.t1 where s1 = 3
<Id> user4 <Host> test Query <Time> <State> insert into test.t1 values (4, 4, 4, 4)
# Performance Schema processlist table
select * from performance_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test Query <Time> <State> select * from performance_schema.processlist order by user, id
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user1 <Host> test Query <Time> <State> insert into test.t1 values (0, 0, 0, 0)
<Id> user2 <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999
<Id> user3 <Host> test Query <Time> <State> delete from test.t1 where s1 = 3
<Id> user4 <Host> test Query <Time> <State> insert into test.t1 values (4, 4, 4, 4)
# Information Schema processlist table
select * from information_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test Query <Time> <State> select * from information_schema.processlist order by user, id
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user1 <Host> test Query <Time> <State> insert into test.t1 values (0, 0, 0, 0)
<Id> user2 <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999
<Id> user3 <Host> test Query <Time> <State> delete from test.t1 where s1 = 3
<Id> user4 <Host> test Query <Time> <State> insert into test.t1 values (4, 4, 4, 4)
### Verify feature code path
# Enable SHOW PROCESSLIST via the Performance Schema
set @@global.performance_schema_show_processlist = on;
# Connection default, send SHOW PROCESSLIST
SET DEBUG_SYNC='pfs_show_processlist_performance_schema SIGNAL pfs_processlist_pfs WAIT_FOR continue';
SHOW FULL PROCESSLIST;
# Connection con0
SET DEBUG_SYNC='now WAIT_FOR pfs_processlist_pfs';
SET DEBUG_SYNC='now SIGNAL continue';
# Connection default, reap
Id User Host db Command Time State Info
<Id> event_scheduler <Host> NULL <Command> <Time> <State> <Info>
<Id> root <Host> test <Command> <Time> <State> <Info>
<Id> root <Host> test <Command> <Time> <State> <Info>
<Id> user1 <Host> test <Command> <Time> <State> <Info>
<Id> user2 <Host> test <Command> <Time> <State> <Info>
<Id> user3 <Host> test <Command> <Time> <State> <Info>
<Id> user4 <Host> test <Command> <Time> <State> <Info>
### Verify legacy code path
# Enable the legacy SHOW PROCESSLIST
set @@global.performance_schema_show_processlist = off;
# Connection default, send SHOW PROCESSLIST
SET DEBUG_SYNC='RESET';
SET DEBUG_SYNC='pfs_show_processlist_legacy SIGNAL pfs_processlist_legacy WAIT_FOR continue';
SHOW FULL PROCESSLIST;
# Connection con0
SET DEBUG_SYNC='now WAIT_FOR pfs_processlist_legacy';
SET DEBUG_SYNC='now SIGNAL continue';
# Connection default, reap
Id User Host db Command Time State Info
<Id> event_scheduler <Host> NULL <Command> <Time> <State> <Info>
<Id> root <Host> test <Command> <Time> <State> <Info>
<Id> root <Host> test <Command> <Time> <State> <Info>
<Id> user1 <Host> test <Command> <Time> <State> <Info>
<Id> user2 <Host> test <Command> <Time> <State> <Info>
<Id> user3 <Host> test <Command> <Time> <State> <Info>
<Id> user4 <Host> test <Command> <Time> <State> <Info>
### Clean up ###
# Connection con0, unlock test.t1, disconnect
unlock tables;
# Connection con1, reap, disconnect
# Connection con2, reap, disconnect
# Connection con3, reap, disconnect
# Connection con4, reap, disconnect
# Connection default
drop table test.t1;
drop user user1@localhost;
drop user user2@localhost;
drop user user3@localhost;
drop user user4@localhost;
set @@global.performance_schema_show_processlist = @save_processlist;

345
mysql-test/suite/perfschema/r/processlist_57.result Normal file
View File

@ -0,0 +1,345 @@
call mtr.add_suppression("Optional native table 'performance_schema'.'processlist' has the wrong structure or is missing.");
call mtr.add_suppression("Column count of performance_schema.processlist is wrong. Expected 8, found 2. The table is probably corrupted");
##
## Verify fresh 5.7 instance
##
SELECT @@global.performance_schema_show_processlist;
@@global.performance_schema_show_processlist
0
SHOW CREATE TABLE performance_schema.processlist;
Table Create Table
processlist CREATE TABLE `processlist` (
`ID` bigint(20) unsigned NOT NULL,
`USER` varchar(32) DEFAULT NULL,
`HOST` varchar(66) DEFAULT NULL,
`DB` varchar(64) DEFAULT NULL,
`COMMAND` varchar(16) DEFAULT NULL,
`TIME` bigint(20) DEFAULT NULL,
`STATE` varchar(64) DEFAULT NULL,
`INFO` longtext
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
##
## Simulate old 5.7 instance
##
DROP TABLE performance_schema.processlist;
SHOW CREATE TABLE performance_schema.processlist;
ERROR 42S02: Table 'performance_schema.processlist' doesn't exist
##
## Server shutdown
##
##
### Server restart
##
##
## Verify old 5.7 instance
##
SELECT @@global.performance_schema_show_processlist;
@@global.performance_schema_show_processlist
0
SHOW CREATE TABLE performance_schema.processlist;
ERROR 42S02: Table 'performance_schema.processlist' doesn't exist
SELECT * FROM performance_schema.processlist;
ERROR 42S02: Table 'performance_schema.processlist' doesn't exist
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
Id User Host db Command Time State Info
2 root [HOST:PORT] test Query [TIME] starting SHOW PROCESSLIST
SET GLOBAL performance_schema_show_processlist = 'ON';
SELECT * FROM performance_schema.processlist;
ERROR 42S02: Table 'performance_schema.processlist' doesn't exist
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
ERROR 42S02: Table 'performance_schema.processlist' doesn't exist
##
## Perform broken upgrade (case 1)
##
CREATE TABLE performance_schema.processlist (a int, b int);
SHOW CREATE TABLE performance_schema.processlist;
Table Create Table
processlist CREATE TABLE `processlist` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8
SET GLOBAL performance_schema_show_processlist = 'OFF';
SELECT * FROM performance_schema.processlist;
a b
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
Id User Host db Command Time State Info
2 root [HOST:PORT] test Query [TIME] starting SHOW PROCESSLIST
SET GLOBAL performance_schema_show_processlist = 'ON';
SELECT * FROM performance_schema.processlist;
a b
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
ERROR 42S22: Unknown column 'ID' in 'field list'
##
## Server shutdown
##
##
### Server restart
##
SHOW CREATE TABLE performance_schema.processlist;
Table Create Table
processlist CREATE TABLE `processlist` (
`a` int(11) DEFAULT NULL,
`b` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=utf8
SET GLOBAL performance_schema_show_processlist = 'OFF';
SELECT * FROM performance_schema.processlist;
a b
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
Id User Host db Command Time State Info
2 root [HOST:PORT] test Query [TIME] starting SHOW PROCESSLIST
SET GLOBAL performance_schema_show_processlist = 'ON';
SELECT * FROM performance_schema.processlist;
a b
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
ERROR 42S22: Unknown column 'ID' in 'field list'
##
## Perform broken upgrade (case 2)
##
DROP TABLE performance_schema.processlist;
CREATE TABLE performance_schema.processlist (
`ID` bigint(20) unsigned NOT NULL,
`USER` varchar(32) DEFAULT NULL,
`HOST` varchar(66) DEFAULT NULL,
`DB` varchar(64) DEFAULT NULL,
`COMMAND` varchar(16) DEFAULT NULL,
`TIME` bigint(20) DEFAULT NULL,
`STATE` varchar(64) DEFAULT NULL,
`INFO` longtext
);
SHOW CREATE TABLE performance_schema.processlist;
Table Create Table
processlist CREATE TABLE `processlist` (
`ID` bigint(20) unsigned NOT NULL,
`USER` varchar(32) DEFAULT NULL,
`HOST` varchar(66) DEFAULT NULL,
`DB` varchar(64) DEFAULT NULL,
`COMMAND` varchar(16) DEFAULT NULL,
`TIME` bigint(20) DEFAULT NULL,
`STATE` varchar(64) DEFAULT NULL,
`INFO` longtext
) ENGINE=InnoDB DEFAULT CHARSET=utf8
SET GLOBAL performance_schema_show_processlist = 'OFF';
SELECT * FROM performance_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
Id User Host db Command Time State Info
2 root [HOST:PORT] test Query [TIME] starting SHOW PROCESSLIST
SET GLOBAL performance_schema_show_processlist = 'ON';
SELECT * FROM performance_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
Id User Host db Command Time State Info
##
## Server shutdown
##
##
### Server restart
##
SHOW CREATE TABLE performance_schema.processlist;
Table Create Table
processlist CREATE TABLE `processlist` (
`ID` bigint(20) unsigned NOT NULL,
`USER` varchar(32) DEFAULT NULL,
`HOST` varchar(66) DEFAULT NULL,
`DB` varchar(64) DEFAULT NULL,
`COMMAND` varchar(16) DEFAULT NULL,
`TIME` bigint(20) DEFAULT NULL,
`STATE` varchar(64) DEFAULT NULL,
`INFO` longtext
) ENGINE=InnoDB DEFAULT CHARSET=utf8
SET GLOBAL performance_schema_show_processlist = 'OFF';
SELECT * FROM performance_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
Id User Host db Command Time State Info
2 root [HOST:PORT] test Query [TIME] starting SHOW PROCESSLIST
SET GLOBAL performance_schema_show_processlist = 'ON';
SELECT * FROM performance_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
Id User Host db Command Time State Info
##
## Perform broken upgrade (case 3)
##
DROP TABLE performance_schema.processlist;
CREATE TABLE performance_schema.processlist
LIKE INFORMATION_SCHEMA.PROCESSLIST;
SHOW CREATE TABLE performance_schema.processlist;
Table Create Table
processlist CREATE TABLE `processlist` (
`ID` bigint(21) unsigned NOT NULL DEFAULT '0',
`USER` varchar(32) NOT NULL DEFAULT '',
`HOST` varchar(64) NOT NULL DEFAULT '',
`DB` varchar(64) DEFAULT NULL,
`COMMAND` varchar(16) NOT NULL DEFAULT '',
`TIME` int(7) NOT NULL DEFAULT '0',
`STATE` varchar(64) DEFAULT NULL,
`INFO` longtext
) ENGINE=InnoDB DEFAULT CHARSET=utf8
SET GLOBAL performance_schema_show_processlist = 'OFF';
SELECT * FROM performance_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
Id User Host db Command Time State Info
2 root [HOST:PORT] test Query [TIME] starting SHOW PROCESSLIST
SET GLOBAL performance_schema_show_processlist = 'ON';
SELECT * FROM performance_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
Id User Host db Command Time State Info
##
## Server shutdown
##
##
### Server restart
##
SHOW CREATE TABLE performance_schema.processlist;
Table Create Table
processlist CREATE TABLE `processlist` (
`ID` bigint(21) unsigned NOT NULL DEFAULT '0',
`USER` varchar(32) NOT NULL DEFAULT '',
`HOST` varchar(64) NOT NULL DEFAULT '',
`DB` varchar(64) DEFAULT NULL,
`COMMAND` varchar(16) NOT NULL DEFAULT '',
`TIME` int(7) NOT NULL DEFAULT '0',
`STATE` varchar(64) DEFAULT NULL,
`INFO` longtext
) ENGINE=InnoDB DEFAULT CHARSET=utf8
SET GLOBAL performance_schema_show_processlist = 'OFF';
SELECT * FROM performance_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
Id User Host db Command Time State Info
2 root [HOST:PORT] test Query [TIME] starting SHOW PROCESSLIST
SET GLOBAL performance_schema_show_processlist = 'ON';
SELECT * FROM performance_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
Id User Host db Command Time State Info
##
## Perform correct upgrade
##
DROP TABLE performance_schema.processlist;
CREATE TABLE performance_schema.processlist (
`ID` bigint(20) unsigned NOT NULL,
`USER` varchar(32) DEFAULT NULL,
`HOST` varchar(66) DEFAULT NULL,
`DB` varchar(64) DEFAULT NULL,
`COMMAND` varchar(16) DEFAULT NULL,
`TIME` bigint(20) DEFAULT NULL,
`STATE` varchar(64) DEFAULT NULL,
`INFO` longtext
) ENGINE = 'PERFORMANCE_SCHEMA';
SHOW CREATE TABLE performance_schema.processlist;
Table Create Table
processlist CREATE TABLE `processlist` (
`ID` bigint(20) unsigned NOT NULL,
`USER` varchar(32) DEFAULT NULL,
`HOST` varchar(66) DEFAULT NULL,
`DB` varchar(64) DEFAULT NULL,
`COMMAND` varchar(16) DEFAULT NULL,
`TIME` bigint(20) DEFAULT NULL,
`STATE` varchar(64) DEFAULT NULL,
`INFO` longtext
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
SET GLOBAL performance_schema_show_processlist = 'OFF';
SELECT * FROM performance_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] Sending data SELECT * FROM performance_schema.processlist
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
Id User Host db Command Time State Info
2 root [HOST:PORT] test Query [TIME] starting SHOW PROCESSLIST
SET GLOBAL performance_schema_show_processlist = 'ON';
SELECT * FROM performance_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] Sending data SELECT * FROM performance_schema.processlist
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
Id User Host db Command Time State Info
2 root [HOST:PORT] test Query [TIME] Sending data SHOW PROCESSLIST
##
## Server shutdown
##
##
### Server restart
##
SHOW CREATE TABLE performance_schema.processlist;
Table Create Table
processlist CREATE TABLE `processlist` (
`ID` bigint(20) unsigned NOT NULL,
`USER` varchar(32) DEFAULT NULL,
`HOST` varchar(66) DEFAULT NULL,
`DB` varchar(64) DEFAULT NULL,
`COMMAND` varchar(16) DEFAULT NULL,
`TIME` bigint(20) DEFAULT NULL,
`STATE` varchar(64) DEFAULT NULL,
`INFO` longtext
) ENGINE=PERFORMANCE_SCHEMA DEFAULT CHARSET=utf8
SET GLOBAL performance_schema_show_processlist = 'OFF';
SELECT * FROM performance_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] Sending data SELECT * FROM performance_schema.processlist
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
Id User Host db Command Time State Info
2 root [HOST:PORT] test Query [TIME] starting SHOW PROCESSLIST
SET GLOBAL performance_schema_show_processlist = 'ON';
SELECT * FROM performance_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] Sending data SELECT * FROM performance_schema.processlist
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
2 root [HOST:PORT] test Query [TIME] executing SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST
SHOW PROCESSLIST;
Id User Host db Command Time State Info
2 root [HOST:PORT] test Query [TIME] Sending data SHOW PROCESSLIST
SET GLOBAL performance_schema_show_processlist = 'OFF';

255
mysql-test/suite/perfschema/r/processlist_acl.result Normal file
View File

@ -0,0 +1,255 @@
##
## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
##
## Verify handling of the SELECT and PROCESS privileges.
##
## Test cases:
## - Execute SHOW PROCESSLIST (new and legacy) with all privileges
## - Execute SELECT on the performance_schema.processlist and information_schema.processlist with all privileges
## - Execute SHOW PROCESSLIST (new and legacy) with no privileges
## - Execute SELECT on the performance_schema.processlist and information_schema.processlist with no privileges
##
## Results must be manually verified.
### Setup ###
select @@global.performance_schema_show_processlist into @save_processlist;
# Control users
create user user_00@localhost, user_01@localhost;
grant ALL on *.* to user_00@localhost;
grant ALL on *.* to user_01@localhost;
# Test users
create user user_all@localhost, user_none@localhost;
grant ALL on *.* to user_all@localhost;
grant USAGE on *.* to user_none@localhost;
flush privileges;
show grants for user_all@localhost;
Grants for user_all@localhost
GRANT ALL PRIVILEGES ON *.* TO 'user_all'@'localhost'
show grants for user_none@localhost;
Grants for user_none@localhost
GRANT USAGE ON *.* TO 'user_none'@'localhost'
use test;
create table test.t1 (s1 int, s2 int, s3 int, s4 int);
# Connect (con_00, localhost, user_00, , )
# Connect (con_01, localhost, user_01, , )
insert into test.t1 values(1, 1, 1, 1);
insert into test.t1 values(2, 2, 2, 2);
insert into test.t1 values(3, 3, 3, 3);
insert into test.t1 values(4, 4, 4, 4);
# Lock test.t1, insert/update/deletes will block
lock tables t1 read;
# Establish 2 connections for user_all
# Connect (con_all_1, localhost, user_all, , )
# Connect (con_all_2, localhost, user_all, , )
insert into test.t1 values (0, 0, 0, 0);
# Establish 4 connections for user_none
# Connect (con_none_1, localhost, user_none, , )
# Connect (con_none_2, localhost, user_none, , )
# Connect (con_none_3, localhost, user_none, , )
# Connect (con_none_4, localhost, user_none, , )
update test.t1 set s1 = s1 + 1, s2 = s2 + 2;;
# Connection con_all_1
# Wait for queries to appear in the processlist table
### Execute SHOW PROCESSLIST with all privileges
### Expect all users
# New SHOW PROCESSLIST
set @@global.performance_schema_show_processlist = on;
SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user_00 <Host> test <Command> <Time> <State> NULL
<Id> user_01 <Host> test <Command> <Time> <State> NULL
<Id> user_all <Host> test Query <Time> <State> SHOW FULL PROCESSLIST
<Id> user_all <Host> test Query <Time> <State> insert into test.t1 values (0, 0, 0, 0)
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2
# Performance Schema processlist table
select * from performance_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user_00 <Host> test <Command> <Time> <State> NULL
<Id> user_01 <Host> test <Command> <Time> <State> NULL
<Id> user_all <Host> test Query <Time> <State> select * from performance_schema.processlist order by user, id
<Id> user_all <Host> test Query <Time> <State> insert into test.t1 values (0, 0, 0, 0)
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2
# Information Schema processlist table
select * from information_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user_00 <Host> test <Command> <Time> <State> NULL
<Id> user_01 <Host> test <Command> <Time> <State> NULL
<Id> user_all <Host> test Query <Time> <State> select * from information_schema.processlist order by user, id
<Id> user_all <Host> test Query <Time> <State> insert into test.t1 values (0, 0, 0, 0)
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2
# Legacy SHOW PROCESSLIST
set @@global.performance_schema_show_processlist = off;
SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user_00 <Host> test <Command> <Time> <State> NULL
<Id> user_01 <Host> test <Command> <Time> <State> NULL
<Id> user_all <Host> test Query <Time> <State> SHOW FULL PROCESSLIST
<Id> user_all <Host> test Query <Time> <State> insert into test.t1 values (0, 0, 0, 0)
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2
# Performance Schema processlist table
select * from performance_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user_00 <Host> test <Command> <Time> <State> NULL
<Id> user_01 <Host> test <Command> <Time> <State> NULL
<Id> user_all <Host> test Query <Time> <State> select * from performance_schema.processlist order by user, id
<Id> user_all <Host> test Query <Time> <State> insert into test.t1 values (0, 0, 0, 0)
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2
# Information Schema processlist table
select * from information_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user_00 <Host> test <Command> <Time> <State> NULL
<Id> user_01 <Host> test <Command> <Time> <State> NULL
<Id> user_all <Host> test Query <Time> <State> select * from information_schema.processlist order by user, id
<Id> user_all <Host> test Query <Time> <State> insert into test.t1 values (0, 0, 0, 0)
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2
### Execute SHOW PROCESSLIST with no SELECT and no PROCESS privileges
### Expect processes only from user_none
# New SHOW PROCESSLIST
set @@global.performance_schema_show_processlist = on;
# Connection con_none_1
SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test Query <Time> <State> SHOW FULL PROCESSLIST
<Id> user_none <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2
# Performance Schema processlist table
select * from performance_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> user_none <Host> test Query <Time> <State> select * from performance_schema.processlist order by user, id
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2
# Information Schema processlist table
select * from information_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> user_none <Host> test Query <Time> <State> select * from information_schema.processlist order by user, id
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2
# Confirm that only processes from user_none are visible
select count(*) as "Expect 0" from performance_schema.processlist
where user not in ('user_none');
Expect 0
0
# Legacy SHOW PROCESSLIST
set @@global.performance_schema_show_processlist = off;
# Connection con_none_1
SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test Query <Time> <State> SHOW FULL PROCESSLIST
<Id> user_none <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2
# Performance Schema processlist table
select * from performance_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> user_none <Host> test Query <Time> <State> select * from performance_schema.processlist order by user, id
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2
# Information Schema processlist table
select * from information_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> user_none <Host> test Query <Time> <State> select * from information_schema.processlist order by user, id
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test <Command> <Time> <State> NULL
<Id> user_none <Host> test Query <Time> <State> update test.t1 set s1 = s1 + 1, s2 = s2 + 2
### Clean up ###
# Disconnect con_00
# Connection con_01, unlock test.t1, disconnect
unlock tables;
# Disconnect con_all_1
# Reap con_all_2, disconnect
# Disconnect con_none_1
# Disconnect con_none_2
# Disconnect con_none_3
# Reap con_none_4, disconnect
# Connection default
drop table test.t1;
drop user user_00@localhost;
drop user user_01@localhost;
drop user user_all@localhost;
drop user user_none@localhost;
set @@global.performance_schema_show_processlist = @save_processlist;

66
mysql-test/suite/perfschema/r/processlist_anonymous.result Normal file
View File

@ -0,0 +1,66 @@
##
## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
## Verify behavior for anonymous users and PROCESS_ACL.
##
SELECT @@global.performance_schema_show_processlist INTO @save_processlist;
SET @@global.performance_schema_show_processlist = OFF;
SHOW GRANTS;
Grants for @localhost
GRANT USAGE ON *.* TO ''@'localhost'
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
SELECT * FROM performance_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
SHOW PROCESSLIST;
ERROR 42000: Access denied; you need (at least one of) the PROCESS privilege(s) for this operation
SET @@global.performance_schema_show_processlist = ON;
SHOW GRANTS;
Grants for @localhost
GRANT USAGE ON *.* TO ''@'localhost'
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
ID USER HOST DB COMMAND TIME STATE INFO
SELECT * FROM performance_schema.processlist;
ID USER HOST DB COMMAND TIME STATE INFO
SHOW PROCESSLIST;
ERROR 42000: Access denied; you need (at least one of) the PROCESS privilege(s) for this operation
GRANT PROCESS ON *.* TO ''@'localhost';
SET @@global.performance_schema_show_processlist = OFF;
SHOW GRANTS;
Grants for @localhost
GRANT PROCESS ON *.* TO ''@'localhost'
SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
count(*) >= 2
1
SELECT count(*) >= 2 FROM performance_schema.processlist;
count(*) >= 2
1
SHOW PROCESSLIST;
SELECT "Previous statement is now completed." as status;
status
Previous statement is now completed.
SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT as BROKEN_ROWS_SENT
FROM performance_schema.events_statements_history
WHERE SQL_TEXT = "SHOW PROCESSLIST";
EVENT_NAME SQL_TEXT BROKEN_ROWS_SENT
statement/sql/show_processlist SHOW PROCESSLIST 0
TRUNCATE TABLE performance_schema.events_statements_history;
set @@global.performance_schema_show_processlist = ON;
SHOW GRANTS;
Grants for @localhost
GRANT PROCESS ON *.* TO ''@'localhost'
SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
count(*) >= 2
1
SELECT count(*) >= 2 FROM performance_schema.processlist;
count(*) >= 2
1
SHOW PROCESSLIST;
SELECT "Previous statement is now completed." as status;
status
Previous statement is now completed.
SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT >= 2
FROM performance_schema.events_statements_history
WHERE SQL_TEXT = "SHOW PROCESSLIST";
EVENT_NAME SQL_TEXT ROWS_SENT >= 2
statement/sql/show_processlist SHOW PROCESSLIST 1
SET @@global.performance_schema_show_processlist = @save_processlist;

181
mysql-test/suite/perfschema/r/processlist_no_pfs.result Normal file
View File

@ -0,0 +1,181 @@
show databases;
Database
information_schema
mtr
mysql
performance_schema
sys
test
select count(*) from performance_schema.performance_timers;
count(*)
0
select count(*) from performance_schema.setup_consumers;
count(*)
0
select count(*) > 4 from performance_schema.setup_instruments;
count(*) > 4
0
select count(*) from performance_schema.setup_timers;
count(*)
0
Warnings:
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;
select * from performance_schema.events_stages_history;
select * from performance_schema.events_stages_history_long;
select * from performance_schema.events_stages_summary_by_account_by_event_name;
select * from performance_schema.events_stages_summary_by_host_by_event_name;
select * from performance_schema.events_stages_summary_by_thread_by_event_name;
select * from performance_schema.events_stages_summary_by_user_by_event_name;
select * from performance_schema.events_stages_summary_global_by_event_name;
select * from performance_schema.events_statements_current;
select * from performance_schema.events_statements_history;
select * from performance_schema.events_statements_history_long;
select * from performance_schema.events_statements_summary_by_account_by_event_name;
select * from performance_schema.events_statements_summary_by_digest;
select * from performance_schema.events_statements_summary_by_host_by_event_name;
select * from performance_schema.events_statements_summary_by_thread_by_event_name;
select * from performance_schema.events_statements_summary_by_user_by_event_name;
select * from performance_schema.events_statements_summary_global_by_event_name;
select * from performance_schema.events_transactions_current;
select * from performance_schema.events_transactions_history;
select * from performance_schema.events_transactions_history_long;
select * from performance_schema.events_transactions_summary_by_account_by_event_name;
select * from performance_schema.events_transactions_summary_by_host_by_event_name;
select * from performance_schema.events_transactions_summary_by_thread_by_event_name;
select * from performance_schema.events_transactions_summary_by_user_by_event_name;
select * from performance_schema.events_transactions_summary_global_by_event_name;
select * from performance_schema.events_waits_current;
select * from performance_schema.events_waits_history;
select * from performance_schema.events_waits_history_long;
select * from performance_schema.events_waits_summary_by_account_by_event_name;
select * from performance_schema.events_waits_summary_by_host_by_event_name;
select * from performance_schema.events_waits_summary_by_instance;
select * from performance_schema.events_waits_summary_by_thread_by_event_name;
select * from performance_schema.events_waits_summary_by_user_by_event_name;
select * from performance_schema.events_waits_summary_global_by_event_name;
select * from performance_schema.memory_summary_by_account_by_event_name;
select * from performance_schema.memory_summary_by_host_by_event_name;
select * from performance_schema.memory_summary_by_thread_by_event_name;
select * from performance_schema.memory_summary_by_user_by_event_name;
select * from performance_schema.memory_summary_global_by_event_name;
select * from performance_schema.file_instances;
select * from performance_schema.file_summary_by_event_name;
select * from performance_schema.file_summary_by_instance;
select * from performance_schema.host_cache;
select * from performance_schema.hosts;
select * from performance_schema.memory_summary_by_account_by_event_name;
select * from performance_schema.memory_summary_by_host_by_event_name;
select * from performance_schema.memory_summary_by_thread_by_event_name;
select * from performance_schema.memory_summary_by_user_by_event_name;
select * from performance_schema.memory_summary_global_by_event_name;
select * from performance_schema.metadata_locks;
select * from performance_schema.mutex_instances;
select * from performance_schema.objects_summary_global_by_type;
select * from performance_schema.performance_timers;
select * from performance_schema.rwlock_instances;
select * from performance_schema.session_account_connect_attrs;
select * from performance_schema.session_connect_attrs;
select * from performance_schema.setup_actors;
select * from performance_schema.setup_consumers;
select * from performance_schema.setup_instruments;
select * from performance_schema.setup_objects;
select * from performance_schema.setup_timers;
select * from performance_schema.socket_instances;
select * from performance_schema.socket_summary_by_instance;
select * from performance_schema.socket_summary_by_event_name;
select * from performance_schema.table_handles;
select * from performance_schema.table_io_waits_summary_by_index_usage;
select * from performance_schema.table_io_waits_summary_by_table;
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 OFF
performance_schema_accounts_size 0
performance_schema_digests_size 0
performance_schema_events_stages_history_long_size 0
performance_schema_events_stages_history_size 0
performance_schema_events_statements_history_long_size 0
performance_schema_events_statements_history_size 0
performance_schema_events_transactions_history_long_size 0
performance_schema_events_transactions_history_size 0
performance_schema_events_waits_history_long_size 0
performance_schema_events_waits_history_size 0
performance_schema_hosts_size 0
performance_schema_max_cond_classes 0
performance_schema_max_cond_instances 0
performance_schema_max_digest_length 0
performance_schema_max_file_classes 0
performance_schema_max_file_handles 0
performance_schema_max_file_instances 0
performance_schema_max_index_stat 0
performance_schema_max_memory_classes 0
performance_schema_max_metadata_locks 0
performance_schema_max_mutex_classes 0
performance_schema_max_mutex_instances 0
performance_schema_max_prepared_statements_instances 0
performance_schema_max_program_instances 0
performance_schema_max_rwlock_classes 0
performance_schema_max_rwlock_instances 0
performance_schema_max_socket_classes 0
performance_schema_max_socket_instances 0
performance_schema_max_sql_text_length 0
performance_schema_max_stage_classes 0
performance_schema_max_statement_classes 0
performance_schema_max_statement_stack 0
performance_schema_max_table_handles 0
performance_schema_max_table_instances 0
performance_schema_max_table_lock_stat 0
performance_schema_max_thread_classes 0
performance_schema_max_thread_instances 0
performance_schema_session_connect_attrs_size 0
performance_schema_setup_actors_size 0
performance_schema_setup_objects_size 0
performance_schema_show_processlist ON
performance_schema_users_size 0
show engine PERFORMANCE_SCHEMA status;
show global status like "performance_schema%";
select * from information_schema.engines
where engine = "PERFORMANCE_SCHEMA";
ENGINE SUPPORT COMMENT TRANSACTIONS XA SAVEPOINTS
PERFORMANCE_SCHEMA YES Performance Schema NO NO NO
# If the Performance Schema is disabled, then expect
# performance-schema-show-processlist = OFF
# regardless of its initial setting
select @@global.performance_schema_show_processlist;
@@global.performance_schema_show_processlist
1
# If the Performance Schema is disabled, then setting
# performance-schema-show-processlist = ON
# succeeds, SHOW PROCESSLIST returns no data.
set @@global.performance_schema_show_processlist = ON;
SHOW PROCESSLIST;
Id User Host db Command Time State Info
show global variables like "performance_schema";
Variable_name Value
performance_schema OFF

145
mysql-test/suite/perfschema/r/processlist_port.result Normal file
View File

@ -0,0 +1,145 @@
##
## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
##
## Verify the Host field (hostname:port) against the legacy implementation.
##
### Setup ###
select @@global.performance_schema_show_processlist into @save_processlist;
# Control user
create user user0@localhost;
grant ALL on *.* to user0@localhost;
# Test users
create user user1@localhost, user2@localhost,
user3@localhost, user4@localhost;
grant USAGE on *.* to user1@localhost;
grant ALL on *.* to user2@localhost;
grant ALL on *.* to user3@localhost;
grant ALL on *.* to user4@localhost;
flush privileges;
show grants for user1@localhost;
Grants for user1@localhost
GRANT USAGE ON *.* TO 'user1'@'localhost'
# Connect (con_user0, 127.0.0.1, user0, , , MASTER_MYPORT, )
select connection_id() into @con_user0_id;
# Connect (con_user1, 127.0.0.1, user1, , , MASTER_MYPORT, )
# Connect (con_user2, 127.0.0.1, user2, , , MASTER_MYPORT, )
# Connect (con_user3, 127.0.0.1, user3, , , MASTER_MYPORT, )
# Connect (con_user4, 127.0.0.1, user4, , , MASTER_MYPORT, )
# Connection user0
### Compare the SHOW PROCESSLIST Host column between the new and old implementations
## New SHOW PROCESSLIST
set @@global.performance_schema_show_processlist = on;
SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user0 <Host> test Query <Time> <State> SHOW FULL PROCESSLIST
<Id> user1 <Host> test <Command> <Time> <State> NULL
<Id> user2 <Host> test <Command> <Time> <State> NULL
<Id> user3 <Host> test <Command> <Time> <State> NULL
<Id> user4 <Host> test <Command> <Time> <State> NULL
# Performance Schema processlist table
select * from performance_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user0 <Host> test Query <Time> <State> select * from performance_schema.processlist order by user, id
<Id> user1 <Host> test <Command> <Time> <State> NULL
<Id> user2 <Host> test <Command> <Time> <State> NULL
<Id> user3 <Host> test <Command> <Time> <State> NULL
<Id> user4 <Host> test <Command> <Time> <State> NULL
# Information Schema processlist table
select * from information_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user0 <Host> test Query <Time> <State> select * from information_schema.processlist order by user, id
<Id> user1 <Host> test <Command> <Time> <State> NULL
<Id> user2 <Host> test <Command> <Time> <State> NULL
<Id> user3 <Host> test <Command> <Time> <State> NULL
<Id> user4 <Host> test <Command> <Time> <State> NULL
# Connection user1
# Get Host:Port, new
## Legacy SHOW PROCESSLIST
set @@global.performance_schema_show_processlist = off;
SHOW FULL PROCESSLIST;
Id User Host db Command Time State Info
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user0 <Host> test Query <Time> <State> SHOW FULL PROCESSLIST
<Id> user1 <Host> test <Command> <Time> <State> NULL
<Id> user2 <Host> test <Command> <Time> <State> NULL
<Id> user3 <Host> test <Command> <Time> <State> NULL
<Id> user4 <Host> test <Command> <Time> <State> NULL
# Performance Schema processlist table
select * from performance_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user0 <Host> test Query <Time> <State> select * from performance_schema.processlist order by user, id
<Id> user1 <Host> test <Command> <Time> <State> NULL
<Id> user2 <Host> test <Command> <Time> <State> NULL
<Id> user3 <Host> test <Command> <Time> <State> NULL
<Id> user4 <Host> test <Command> <Time> <State> NULL
# Information Schema processlist table
select * from information_schema.processlist order by user, id;
ID USER HOST DB COMMAND TIME STATE INFO
<Id> event_scheduler <Host> NULL <Command> <Time> <State> NULL
<Id> root <Host> test <Command> <Time> <State> NULL
<Id> user0 <Host> test Query <Time> <State> select * from information_schema.processlist order by user, id
<Id> user1 <Host> test <Command> <Time> <State> NULL
<Id> user2 <Host> test <Command> <Time> <State> NULL
<Id> user3 <Host> test <Command> <Time> <State> NULL
<Id> user4 <Host> test <Command> <Time> <State> NULL
# Connection user1
# Get Host:Port, legacy
***SUCCESS*** The SHOW PROCESSLIST Host fields match
### Compare the processlist Host column between Performance Schema and the Information Schema
# Connection con_user0
***SUCCESS*** The processlist Host fields match between the Performance Schema and the Information Schema
### Clean up ###
# Disconnect con_user0
# Disconnect con_user1
# Disconnect con_user2
# Disconnect con_user3
# Disconnect con_user4
# Connection default
drop user user0@localhost;
drop user user1@localhost;
drop user user2@localhost;
drop user user3@localhost;
drop user user4@localhost;
set @@global.performance_schema_show_processlist = @save_processlist;

89
mysql-test/suite/perfschema/r/processlist_reg_user.result Normal file
View File

@ -0,0 +1,89 @@
##
## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
## Verify behavior for regular users and PROCESS_ACL.
##
SELECT @@global.performance_schema_show_processlist INTO @save_processlist;
SET @@global.performance_schema_show_processlist = OFF;
CREATE USER 'regular'@'localhost';
SHOW GRANTS;
Grants for regular@localhost
GRANT USAGE ON *.* TO 'regular'@'localhost'
SELECT USER, INFO FROM INFORMATION_SCHEMA.PROCESSLIST;
USER INFO
regular SELECT USER, INFO FROM INFORMATION_SCHEMA.PROCESSLIST
SELECT USER, INFO FROM performance_schema.processlist;
USER INFO
regular SELECT USER, INFO FROM performance_schema.processlist
SHOW PROCESSLIST;
SELECT "Previous statement is now completed." as status;
status
Previous statement is now completed.
SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT as BROKEN_ROWS_SENT
FROM performance_schema.events_statements_history
WHERE SQL_TEXT = "SHOW PROCESSLIST";
EVENT_NAME SQL_TEXT BROKEN_ROWS_SENT
statement/sql/show_processlist SHOW PROCESSLIST 0
TRUNCATE TABLE performance_schema.events_statements_history;
SET @@global.performance_schema_show_processlist = ON;
SHOW GRANTS;
Grants for regular@localhost
GRANT USAGE ON *.* TO 'regular'@'localhost'
SELECT USER, INFO FROM INFORMATION_SCHEMA.PROCESSLIST;
USER INFO
regular SELECT USER, INFO FROM INFORMATION_SCHEMA.PROCESSLIST
SELECT USER, INFO FROM performance_schema.processlist;
USER INFO
regular SELECT USER, INFO FROM performance_schema.processlist
SHOW PROCESSLIST;
SELECT "Previous statement is now completed." as status;
status
Previous statement is now completed.
SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT
FROM performance_schema.events_statements_history
WHERE SQL_TEXT = "SHOW PROCESSLIST";
EVENT_NAME SQL_TEXT ROWS_SENT
statement/sql/show_processlist SHOW PROCESSLIST 1
TRUNCATE TABLE performance_schema.events_statements_history;
GRANT PROCESS ON *.* TO 'regular'@'localhost';
SET @@global.performance_schema_show_processlist = OFF;
SHOW GRANTS;
Grants for regular@localhost
GRANT PROCESS ON *.* TO 'regular'@'localhost'
SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
count(*) >= 2
1
SELECT count(*) >= 2 FROM performance_schema.processlist;
count(*) >= 2
1
SHOW PROCESSLIST;
SELECT "Previous statement is now completed." as status;
status
Previous statement is now completed.
SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT as BROKEN_ROWS_SENT
FROM performance_schema.events_statements_history
WHERE SQL_TEXT = "SHOW PROCESSLIST";
EVENT_NAME SQL_TEXT BROKEN_ROWS_SENT
statement/sql/show_processlist SHOW PROCESSLIST 0
TRUNCATE TABLE performance_schema.events_statements_history;
SET @@global.performance_schema_show_processlist = ON;
SHOW GRANTS;
Grants for regular@localhost
GRANT PROCESS ON *.* TO 'regular'@'localhost'
SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
count(*) >= 2
1
SELECT count(*) >= 2 FROM performance_schema.processlist;
count(*) >= 2
1
SHOW PROCESSLIST;
SELECT "Previous statement is now completed." as status;
status
Previous statement is now completed.
SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT >= 2
FROM performance_schema.events_statements_history
WHERE SQL_TEXT = "SHOW PROCESSLIST";
EVENT_NAME SQL_TEXT ROWS_SENT >= 2
statement/sql/show_processlist SHOW PROCESSLIST 1
TRUNCATE TABLE performance_schema.events_statements_history;
SET @@global.performance_schema_show_processlist = @save_processlist;
DROP USER 'regular'@'localhost';

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

@ -414,6 +414,7 @@ SHOW_MODE SOURCE VARIABLE_NAME
5.6 I_S.SESSION_VARIABLES INNODB_STATS_INCLUDE_DELETE_MARKED
5.6 I_S.SESSION_VARIABLES KEYRING_OPERATIONS
5.6 I_S.SESSION_VARIABLES LOG_STATEMENTS_UNSAFE_FOR_BINLOG
5.6 I_S.SESSION_VARIABLES PERFORMANCE_SCHEMA_SHOW_PROCESSLIST
5.6 I_S.SESSION_VARIABLES REPLICATION_OPTIMIZE_FOR_STATIC_PLUGIN_CONFIG
5.6 I_S.SESSION_VARIABLES REPLICATION_SENDER_OBSERVE_COMMIT_ONLY
5.6 I_S.SESSION_VARIABLES TLS_VERSION
@ -444,6 +445,7 @@ SHOW_MODE SOURCE VARIABLE_NAME
5.6 I_S.SESSION_VARIABLES INNODB_STATS_INCLUDE_DELETE_MARKED
5.6 I_S.SESSION_VARIABLES KEYRING_OPERATIONS
5.6 I_S.SESSION_VARIABLES LOG_STATEMENTS_UNSAFE_FOR_BINLOG
5.6 I_S.SESSION_VARIABLES PERFORMANCE_SCHEMA_SHOW_PROCESSLIST
5.6 I_S.SESSION_VARIABLES REPLICATION_OPTIMIZE_FOR_STATIC_PLUGIN_CONFIG
5.6 I_S.SESSION_VARIABLES REPLICATION_SENDER_OBSERVE_COMMIT_ONLY
5.6 I_S.SESSION_VARIABLES TLS_VERSION

8
mysql-test/suite/perfschema/r/threads_mysql.result
View File

@ -3,7 +3,7 @@ SELECT name, type, processlist_user, processlist_host, processlist_db,
processlist_command, processlist_info, connection_type,
IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id')
AS unified_parent_thread_id,
role, instrumented
`role`, instrumented
FROM performance_schema.threads
WHERE name LIKE 'thread/sql%'
ORDER BY name;
@ -39,7 +39,7 @@ processlist_info SELECT name, type, processlist_user, processlist_host, processl
processlist_command, processlist_info, connection_type,
IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id')
AS unified_parent_thread_id,
role, instrumented
`role`, instrumented
FROM performance_schema.threads
WHERE name LIKE 'thread/sql%'
ORDER BY name
@ -66,7 +66,7 @@ SELECT name, type, processlist_user, processlist_host, processlist_db,
processlist_command, processlist_info,
IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id')
AS unified_parent_thread_id,
role, instrumented
`role`, instrumented
FROM performance_schema.threads
WHERE name LIKE 'thread/sql%'
AND thread_id NOT IN (SELECT thread_id FROM t1)
@ -94,7 +94,7 @@ SELECT name, type, processlist_user, processlist_host, processlist_db,
processlist_command, processlist_info,
IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id')
AS unified_parent_thread_id,
role, instrumented
`role`, instrumented
FROM performance_schema.threads
WHERE name LIKE 'thread/sql%'
AND thread_id NOT IN (SELECT thread_id FROM t1)

32
mysql-test/suite/perfschema/t/ddl_processlist.test Normal file
View File

@ -0,0 +1,32 @@
# Tests for PERFORMANCE_SCHEMA
--source include/not_embedded.inc
select @@global.performance_schema_show_processlist into @save_processlist;
set @@global.performance_schema_show_processlist = 'on';
--error ER_DBACCESS_DENIED_ERROR
alter table performance_schema.processlist
add column foo integer;
--error ER_WRONG_PERFSCHEMA_USAGE
truncate table performance_schema.processlist;
--error ER_DBACCESS_DENIED_ERROR
alter table performance_schema.processlist
add index test_index(info);
--error ER_DBACCESS_DENIED_ERROR
create unique index test_index
on performance_schema.processlist(host);
-- error ER_DBACCESS_DENIED_ERROR
drop index `PRIMARY`
on performance_schema.processlist;
CREATE TABLE test.create_select
AS SELECT * from performance_schema.processlist;
DROP TABLE test.create_select;
set @@global.performance_schema_show_processlist = @save_processlist;

39
mysql-test/suite/perfschema/t/dml_processlist.test Normal file
View File

@ -0,0 +1,39 @@
# Tests for PERFORMANCE_SCHEMA
--source include/not_embedded.inc
select @@global.performance_schema_show_processlist into @save_processlist;
set @@global.performance_schema_show_processlist = 'on';
--disable_result_log
select * from performance_schema.processlist
where user like 'event_scheduler';
select * from performance_schema.processlist
where user = 'FOO';
--enable_result_log
--error ER_TABLEACCESS_DENIED_ERROR
insert into performance_schema.processlist
values (12, 'foo', 'bar', 'test', null, 1000, 'state', 'info');
--error ER_TABLEACCESS_DENIED_ERROR
update performance_schema.processlist
set id=12, user='foo';
--error ER_TABLEACCESS_DENIED_ERROR
delete from performance_schema.processlist
where id <> 99;
--error ER_TABLEACCESS_DENIED_ERROR
delete from performance_schema.processlist;
--error ER_TABLEACCESS_DENIED_ERROR
LOCK TABLES performance_schema.processlist READ;
UNLOCK TABLES;
--error ER_TABLEACCESS_DENIED_ERROR
LOCK TABLES performance_schema.processlist WRITE;
UNLOCK TABLES;
set @@global.performance_schema_show_processlist = @save_processlist;

1
mysql-test/suite/perfschema/t/misc_global_status-master.opt Normal file
View File

@ -0,0 +1 @@
--loose-performance_schema_hosts_size=0

134
mysql-test/suite/perfschema/t/misc_global_status.test Normal file
View File

@ -0,0 +1,134 @@
# Tests for PERFORMANCE_SCHEMA
--source include/not_embedded.inc
--source include/have_perfschema.inc
--source include/have_query_cache_disabled.inc
CREATE USER user1@localhost;
CREATE USER user2@localhost;
CREATE USER user3@localhost;
grant ALL on *.* to user1@localhost;
grant ALL on *.* to user2@localhost;
grant ALL on *.* to user3@localhost;
# To aggregate to accounts
#SET GLOBAL show_compatibility_56=0;
TRUNCATE TABLE performance_schema.accounts;
FLUSH PRIVILEGES;
CREATE TABLE test.t_range(a int, b int, PRIMARY KEY(a));
INSERT INTO test.t_range values (1, 1), (2,2), (3, 3), (4, 4), (5, 5);
INSERT INTO test.t_range values (6, 6), (7,7), (8, 8), (9, 9), (10, 10);
FLUSH STATUS;
let $initial= `SELECT VARIABLE_VALUE FROM performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range'`;
# Causes Select_range to increment (+1)
SELECT * from test.t_range where (a >= 3) AND (a <= 5);
SELECT * from performance_schema.session_status
WHERE VARIABLE_NAME = 'Select_range';
--disable_query_log
eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
--enable_query_log
connect(con1, localhost, user1,,);
# Causes Select_range to increment (+1)
SELECT * from test.t_range where (a >= 3) AND (a <= 5);
SELECT * from performance_schema.session_status
WHERE VARIABLE_NAME = 'Select_range';
--disable_query_log
eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
--enable_query_log
connect(con2, localhost, user2,,);
# Causes Select_range to increment (+2)
SELECT * from test.t_range where (a >= 3) AND (a <= 5);
SELECT * from test.t_range where (a >= 4) AND (a <= 6);
SELECT * from performance_schema.session_status
WHERE VARIABLE_NAME = 'Select_range';
--disable_query_log
eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
--enable_query_log
connect(con3, localhost, user3,,);
# Causes Select_range to increment (+3)
SELECT * from test.t_range where (a >= 3) AND (a <= 5);
SELECT * from test.t_range where (a >= 4) AND (a <= 6);
SELECT * from test.t_range where (a >= 5) AND (a <= 7);
SELECT * from performance_schema.session_status
WHERE VARIABLE_NAME = 'Select_range';
--disable_query_log
eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
--enable_query_log
--connection default
--disable_query_log
eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
--enable_query_log
SELECT `USER`, `HOST`, VARIABLE_NAME, VARIABLE_VALUE
FROM performance_schema.status_by_account WHERE VARIABLE_NAME = 'Select_range'
AND `USER` LIKE 'user%'
ORDER BY `USER`;
--disconnect con1
--disconnect con2
# Wait till all disconnects are completed
let $count_sessions= 2;
--source include/wait_until_count_sessions.inc
--disable_query_log
eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
--enable_query_log
TRUNCATE TABLE performance_schema.accounts;
--disable_query_log
eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
--enable_query_log
--disconnect con3
# Wait till all disconnects are completed
let $count_sessions= 1;
--source include/wait_until_count_sessions.inc
--disable_query_log
eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
--enable_query_log
# Make sure TRUNCATE on accounts does not add to global_status
TRUNCATE TABLE performance_schema.accounts;
--disable_query_log
eval SELECT VARIABLE_NAME, (VARIABLE_VALUE - $initial) AS DELTA from performance_schema.global_status WHERE VARIABLE_NAME = 'Select_range';
--enable_query_log
DROP TABLE test.t_range;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user1@localhost;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user2@localhost;
REVOKE ALL PRIVILEGES, GRANT OPTION FROM user3@localhost;
DROP USER user1@localhost;
DROP USER user2@localhost;
DROP USER user3@localhost;
#SET GLOBAL show_compatibility_56=1;
FLUSH PRIVILEGES;

1
mysql-test/suite/perfschema/t/processlist-master.opt Normal file
View File

@ -0,0 +1 @@
--event-scheduler

197
mysql-test/suite/perfschema/t/processlist.test Normal file
View File

@ -0,0 +1,197 @@
--echo ##
--echo ## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
--echo ##
--echo ## Test cases:
--echo ## 1. Execute the new SHOW [FULL] PROCESSLIST and SELECT on performance_schema.processlist
--echo ## 2. Execute the legacy SHOW [FULL] PROCESSLIST and SELECT on information_schema.processlist
--echo ## 3. Verify that performance_schema_show_processlist = ON executes the new implementation
--echo ## 4. Verify that performance_schema_show_processlist = OFF executes the legacy code path
--echo ##
--echo ## Results must be manually verified.
--source include/no_protocol.inc
--source include/have_debug.inc
--source include/have_debug_sync.inc
--source include/not_embedded.inc
--echo
--echo ### Setup ###
--echo
select @@global.performance_schema_show_processlist into @save_processlist;
--echo
create user user1@localhost, user2@localhost,
user3@localhost, user4@localhost;
--echo
grant ALL on *.* to user1@localhost;
grant ALL on *.* to user2@localhost;
grant ALL on *.* to user3@localhost;
grant ALL on *.* to user4@localhost;
--echo
flush privileges;
--echo
use test;
create table test.t1 (s1 int, s2 int, s3 int, s4 int);
--echo
--echo # Switch to (con0, localhost, root, , )
connect (con0, localhost, root, , );
--echo
insert into test.t1 values(1, 1, 1, 1);
insert into test.t1 values(2, 2, 2, 2);
insert into test.t1 values(3, 3, 3, 3);
insert into test.t1 values(4, 4, 4, 4);
--echo
--echo # Lock test.t1, insert/update/deletes will block
lock tables t1 read;
--echo
--echo # Connect (con1, localhost, user1, , )
connect (con1, localhost, user1, , );
--send insert into test.t1 values (0, 0, 0, 0)
--echo
--echo # Connect (con2, localhost, user2, , )
connect (con2, localhost, user2, , );
# Create a query > 100 characters
--send update test.t1 set s1 = s1 + 1, s2 = s2 + 2, s3 = s3 + 3, s4 = ((s4 + 4) * (s4 + 5)) + 12345 + 67890 + 11111 + 22222 + 33333 + 44444 + 55555 + 99999;
--echo
--echo # Connect (con3, localhost, user3, , )
connect (con3, localhost, user3, , );
--send delete from test.t1 where s1 = 3
--echo
--echo # Connect (con4, localhost, user4, , )
connect (con4, localhost, user4, , );
--send insert into test.t1 values (4, 4, 4, 4)
--echo
--echo # Connection default
--connection default
--echo
--echo # Wait for queries to appear in the processlist table
let $wait_condition = select count(*) >= 4 from information_schema.processlist
where state like '%metadata%';
--source include/wait_condition.inc
--echo
--echo
--echo ### Execute new SHOW [FULL] PROCESSLIST and SELECT on performance_schema.processlist
--echo
let $pfs_spl = on;
--source ../include/processlist_set.inc
--source ../include/processlist_load.inc
--echo
--echo
--echo ### Execute legacy SHOW [FULL] PROCESSLIST and SELECT on information_schema.processlist
--echo
let $pfs_spl = off;
--source ../include/processlist_set.inc
--source ../include/processlist_load.inc
--echo
--echo
--echo ### Verify feature code path
--echo
--echo # Enable SHOW PROCESSLIST via the Performance Schema
let $pfs_spl = on;
--source ../include/processlist_set.inc
--echo
--echo # Connection default, send SHOW PROCESSLIST
--connection default
SET DEBUG_SYNC='pfs_show_processlist_performance_schema SIGNAL pfs_processlist_pfs WAIT_FOR continue';
--send SHOW FULL PROCESSLIST
--echo
--echo # Connection con0
--connection con0
SET DEBUG_SYNC='now WAIT_FOR pfs_processlist_pfs';
SET DEBUG_SYNC='now SIGNAL continue';
--echo
--echo # Connection default, reap
--connection default
--replace_column 1 <Id> 3 <Host> 5 <Command> 6 <Time> 7 <State> 8 <Info>
--sorted_result
--reap
--echo
--echo
--echo ### Verify legacy code path
--echo
--echo # Enable the legacy SHOW PROCESSLIST
let $pfs_spl = off;
--source ../include/processlist_set.inc
--echo
--echo # Connection default, send SHOW PROCESSLIST
--connection default
SET DEBUG_SYNC='RESET';
SET DEBUG_SYNC='pfs_show_processlist_legacy SIGNAL pfs_processlist_legacy WAIT_FOR continue';
--send SHOW FULL PROCESSLIST
--echo
--echo # Connection con0
--connection con0
SET DEBUG_SYNC='now WAIT_FOR pfs_processlist_legacy';
SET DEBUG_SYNC='now SIGNAL continue';
--echo
--echo # Connection default, reap
--connection default
--replace_column 1 <Id> 3 <Host> 5 <Command> 6 <Time> 7 <State> 8 <Info>
--sorted_result
--reap
--echo
--echo
--echo ### Clean up ###
--echo
--echo # Connection con0, unlock test.t1, disconnect
--connection con0
unlock tables;
--disconnect con0
--disable_query_log
--disable_result_log
--echo
--echo # Connection con1, reap, disconnect
--connection con1
--reap
--disconnect con1
--echo # Connection con2, reap, disconnect
--connection con2
--reap
--disconnect con2
--echo # Connection con3, reap, disconnect
--connection con3
--reap
--disconnect con3
--echo # Connection con4, reap, disconnect
--connection con4
--reap
--disconnect con4
--enable_result_log
--enable_query_log
--echo
--echo # Connection default
--connection default
--echo
drop table test.t1;
drop user user1@localhost;
drop user user2@localhost;
drop user user3@localhost;
drop user user4@localhost;
--echo
set @@global.performance_schema_show_processlist = @save_processlist;

349
mysql-test/suite/perfschema/t/processlist_57.test Normal file
View File

@ -0,0 +1,349 @@
--source include/no_protocol.inc
--source include/not_embedded.inc
call mtr.add_suppression("Optional native table 'performance_schema'.'processlist' has the wrong structure or is missing.");
call mtr.add_suppression("Column count of performance_schema.processlist is wrong. Expected 8, found 2. The table is probably corrupted");
--echo ##
--echo ## Verify fresh 5.7 instance
--echo ##
SELECT @@global.performance_schema_show_processlist;
SHOW CREATE TABLE performance_schema.processlist;
--echo ##
--echo ## Simulate old 5.7 instance
--echo ##
DROP TABLE performance_schema.processlist;
--error ER_NO_SUCH_TABLE
SHOW CREATE TABLE performance_schema.processlist;
let $restart_file= $MYSQLTEST_VARDIR/tmp/mysqld.1.expect;
--exec echo "wait" > $restart_file
--echo ##
--echo ## Server shutdown
--echo ##
--shutdown_server
--source include/wait_until_disconnected.inc
--echo ##
--echo ### Server restart
--echo ##
--exec echo "restart:">$restart_file
--enable_reconnect
--source include/wait_until_connected_again.inc
--echo ##
--echo ## Verify old 5.7 instance
--echo ##
SELECT @@global.performance_schema_show_processlist;
--error ER_NO_SUCH_TABLE
SHOW CREATE TABLE performance_schema.processlist;
--error ER_NO_SUCH_TABLE
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--replace_column 3 [HOST:PORT] 6 [TIME]
SHOW PROCESSLIST;
SET GLOBAL performance_schema_show_processlist = 'ON';
--error ER_NO_SUCH_TABLE
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--error ER_NO_SUCH_TABLE
SHOW PROCESSLIST;
--echo ##
--echo ## Perform broken upgrade (case 1)
--echo ##
CREATE TABLE performance_schema.processlist (a int, b int);
SHOW CREATE TABLE performance_schema.processlist;
SET GLOBAL performance_schema_show_processlist = 'OFF';
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--replace_column 3 [HOST:PORT] 6 [TIME]
SHOW PROCESSLIST;
SET GLOBAL performance_schema_show_processlist = 'ON';
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--error ER_BAD_FIELD_ERROR
SHOW PROCESSLIST;
--exec echo "wait" > $restart_file
--echo ##
--echo ## Server shutdown
--echo ##
--shutdown_server
--source include/wait_until_disconnected.inc
--echo ##
--echo ### Server restart
--echo ##
--exec echo "restart:">$restart_file
--enable_reconnect
--source include/wait_until_connected_again.inc
SHOW CREATE TABLE performance_schema.processlist;
SET GLOBAL performance_schema_show_processlist = 'OFF';
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--replace_column 3 [HOST:PORT] 6 [TIME]
SHOW PROCESSLIST;
SET GLOBAL performance_schema_show_processlist = 'ON';
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--error ER_BAD_FIELD_ERROR
SHOW PROCESSLIST;
--echo ##
--echo ## Perform broken upgrade (case 2)
--echo ##
DROP TABLE performance_schema.processlist;
CREATE TABLE performance_schema.processlist (
`ID` bigint(20) unsigned NOT NULL,
`USER` varchar(32) DEFAULT NULL,
`HOST` varchar(66) DEFAULT NULL,
`DB` varchar(64) DEFAULT NULL,
`COMMAND` varchar(16) DEFAULT NULL,
`TIME` bigint(20) DEFAULT NULL,
`STATE` varchar(64) DEFAULT NULL,
`INFO` longtext
);
SHOW CREATE TABLE performance_schema.processlist;
SET GLOBAL performance_schema_show_processlist = 'OFF';
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--replace_column 3 [HOST:PORT] 6 [TIME]
SHOW PROCESSLIST;
SET GLOBAL performance_schema_show_processlist = 'ON';
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
# Works and returns no data, innodb table is empty.
SHOW PROCESSLIST;
--exec echo "wait" > $restart_file
--echo ##
--echo ## Server shutdown
--echo ##
--shutdown_server
--source include/wait_until_disconnected.inc
--echo ##
--echo ### Server restart
--echo ##
--exec echo "restart:">$restart_file
--enable_reconnect
--source include/wait_until_connected_again.inc
SHOW CREATE TABLE performance_schema.processlist;
SET GLOBAL performance_schema_show_processlist = 'OFF';
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--replace_column 3 [HOST:PORT] 6 [TIME]
SHOW PROCESSLIST;
SET GLOBAL performance_schema_show_processlist = 'ON';
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
# Works and returns no data, innodb table is empty.
SHOW PROCESSLIST;
--echo ##
--echo ## Perform broken upgrade (case 3)
--echo ##
DROP TABLE performance_schema.processlist;
CREATE TABLE performance_schema.processlist
LIKE INFORMATION_SCHEMA.PROCESSLIST;
SHOW CREATE TABLE performance_schema.processlist;
SET GLOBAL performance_schema_show_processlist = 'OFF';
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--replace_column 3 [HOST:PORT] 6 [TIME]
SHOW PROCESSLIST;
SET GLOBAL performance_schema_show_processlist = 'ON';
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
# Works and returns no data, innodb table is empty.
SHOW PROCESSLIST;
--exec echo "wait" > $restart_file
--echo ##
--echo ## Server shutdown
--echo ##
--shutdown_server
--source include/wait_until_disconnected.inc
--echo ##
--echo ### Server restart
--echo ##
--exec echo "restart:">$restart_file
--enable_reconnect
--source include/wait_until_connected_again.inc
SHOW CREATE TABLE performance_schema.processlist;
SET GLOBAL performance_schema_show_processlist = 'OFF';
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--replace_column 3 [HOST:PORT] 6 [TIME]
SHOW PROCESSLIST;
SET GLOBAL performance_schema_show_processlist = 'ON';
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
# Works and returns no data, innodb table is empty.
SHOW PROCESSLIST;
--echo ##
--echo ## Perform correct upgrade
--echo ##
DROP TABLE performance_schema.processlist;
CREATE TABLE performance_schema.processlist (
`ID` bigint(20) unsigned NOT NULL,
`USER` varchar(32) DEFAULT NULL,
`HOST` varchar(66) DEFAULT NULL,
`DB` varchar(64) DEFAULT NULL,
`COMMAND` varchar(16) DEFAULT NULL,
`TIME` bigint(20) DEFAULT NULL,
`STATE` varchar(64) DEFAULT NULL,
`INFO` longtext
) ENGINE = 'PERFORMANCE_SCHEMA';
SHOW CREATE TABLE performance_schema.processlist;
SET GLOBAL performance_schema_show_processlist = 'OFF';
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--replace_column 3 [HOST:PORT] 6 [TIME]
SHOW PROCESSLIST;
SET GLOBAL performance_schema_show_processlist = 'ON';
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--replace_column 3 [HOST:PORT] 6 [TIME]
SHOW PROCESSLIST;
--exec echo "wait" > $restart_file
--echo ##
--echo ## Server shutdown
--echo ##
--shutdown_server
--source include/wait_until_disconnected.inc
--echo ##
--echo ### Server restart
--echo ##
--exec echo "restart:">$restart_file
--enable_reconnect
--source include/wait_until_connected_again.inc
SHOW CREATE TABLE performance_schema.processlist;
SET GLOBAL performance_schema_show_processlist = 'OFF';
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--replace_column 3 [HOST:PORT] 6 [TIME]
SHOW PROCESSLIST;
SET GLOBAL performance_schema_show_processlist = 'ON';
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM performance_schema.processlist;
--replace_column 3 [HOST:PORT] 6 [TIME]
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
--replace_column 3 [HOST:PORT] 6 [TIME]
SHOW PROCESSLIST;
# Cleanup
SET GLOBAL performance_schema_show_processlist = 'OFF';

1
mysql-test/suite/perfschema/t/processlist_acl-master.opt Normal file
View File

@ -0,0 +1 @@
--event-scheduler

196
mysql-test/suite/perfschema/t/processlist_acl.test Normal file
View File

@ -0,0 +1,196 @@
--echo ##
--echo ## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
--echo ##
--echo ## Verify handling of the SELECT and PROCESS privileges.
--echo ##
--echo ## Test cases:
--echo ## - Execute SHOW PROCESSLIST (new and legacy) with all privileges
--echo ## - Execute SELECT on the performance_schema.processlist and information_schema.processlist with all privileges
--echo ## - Execute SHOW PROCESSLIST (new and legacy) with no privileges
--echo ## - Execute SELECT on the performance_schema.processlist and information_schema.processlist with no privileges
--echo ##
--echo ## Results must be manually verified.
--echo
--source include/no_protocol.inc
--source include/not_embedded.inc
--echo ### Setup ###
--echo
select @@global.performance_schema_show_processlist into @save_processlist;
--echo
--echo # Control users
create user user_00@localhost, user_01@localhost;
grant ALL on *.* to user_00@localhost;
grant ALL on *.* to user_01@localhost;
--echo
--echo # Test users
create user user_all@localhost, user_none@localhost;
grant ALL on *.* to user_all@localhost;
grant USAGE on *.* to user_none@localhost;
--echo
flush privileges;
--echo
show grants for user_all@localhost;
--echo
show grants for user_none@localhost;
--echo
use test;
create table test.t1 (s1 int, s2 int, s3 int, s4 int);
--echo
--echo # Connect (con_00, localhost, user_00, , )
connect (con_00, localhost, user_00, , );
--echo # Connect (con_01, localhost, user_01, , )
connect (con_01, localhost, user_01, , );
--echo
insert into test.t1 values(1, 1, 1, 1);
insert into test.t1 values(2, 2, 2, 2);
insert into test.t1 values(3, 3, 3, 3);
insert into test.t1 values(4, 4, 4, 4);
--echo
--echo # Lock test.t1, insert/update/deletes will block
lock tables t1 read;
--echo
--echo # Establish 2 connections for user_all
--echo # Connect (con_all_1, localhost, user_all, , )
connect (con_all_1, localhost, user_all, , );
--echo # Connect (con_all_2, localhost, user_all, , )
connect (con_all_2, localhost, user_all, , );
--send insert into test.t1 values (0, 0, 0, 0)
--echo
--echo # Establish 4 connections for user_none
--echo # Connect (con_none_1, localhost, user_none, , )
connect (con_none_1, localhost, user_none, , );
--echo # Connect (con_none_2, localhost, user_none, , )
connect (con_none_2, localhost, user_none, , );
--echo # Connect (con_none_3, localhost, user_none, , )
connect (con_none_3, localhost, user_none, , );
--echo # Connect (con_none_4, localhost, user_none, , )
connect (con_none_4, localhost, user_none, , );
--send update test.t1 set s1 = s1 + 1, s2 = s2 + 2;
--echo
--echo # Connection con_all_1
--connection con_all_1
# Note: When expecting processlist results for all users, the wait_condition
# and subsequent execution of SHOW PROCESSLIST should be conducted from the
# same connection to ensure consistent values in the Command and Info columns.
--echo
--echo # Wait for queries to appear in the processlist table
let $wait_condition = select count(*) >= 2 from information_schema.processlist
where state like '%metadata%';
--source include/wait_condition.inc
--echo
--echo ### Execute SHOW PROCESSLIST with all privileges
--echo ### Expect all users
--echo
--echo # New SHOW PROCESSLIST
let $pfs_spl = on;
--source ../include/processlist_set.inc
--source ../include/processlist_load.inc
--echo
--echo # Legacy SHOW PROCESSLIST
let $pfs_spl = off;
--source ../include/processlist_set.inc
--source ../include/processlist_load.inc
--echo
--echo
--echo ### Execute SHOW PROCESSLIST with no SELECT and no PROCESS privileges
--echo ### Expect processes only from user_none
--echo
--echo # New SHOW PROCESSLIST
let $pfs_spl = on;
--source ../include/processlist_set.inc
--echo
--echo # Connection con_none_1
--connection con_none_1
--source ../include/processlist_load.inc
--echo
--echo # Confirm that only processes from user_none are visible
--echo
select count(*) as "Expect 0" from performance_schema.processlist
where user not in ('user_none');
--echo
--echo # Legacy SHOW PROCESSLIST
--connection con_00
let $pfs_spl = off;
--source ../include/processlist_set.inc
--echo
--echo # Connection con_none_1
--connection con_none_1
--source ../include/processlist_load.inc
--echo
--echo
--echo ### Clean up ###
--echo
--echo # Disconnect con_00
--connection con_00
--disconnect con_00
--echo # Connection con_01, unlock test.t1, disconnect
--connection con_01
unlock tables;
--disconnect con_01
--echo # Disconnect con_all_1
--connection con_all_1
--disconnect con_all_1
--echo # Reap con_all_2, disconnect
--connection con_all_2
--reap
--disconnect con_all_2
--echo # Disconnect con_none_1
--connection con_none_1
--disconnect con_none_1
--echo # Disconnect con_none_2
--connection con_none_2
--disconnect con_none_2
--echo # Disconnect con_none_3
--connection con_none_3
--disconnect con_none_3
--echo # Reap con_none_4, disconnect
--connection con_none_4
--reap
--disconnect con_none_4
--echo
--echo # Connection default
--connection default
--echo
drop table test.t1;
drop user user_00@localhost;
drop user user_01@localhost;
drop user user_all@localhost;
drop user user_none@localhost;
--echo
set @@global.performance_schema_show_processlist = @save_processlist;

111
mysql-test/suite/perfschema/t/processlist_anonymous.test Normal file
View File

@ -0,0 +1,111 @@
--echo ##
--echo ## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
--echo ## Verify behavior for anonymous users and PROCESS_ACL.
--echo ##
--source include/no_protocol.inc
--source include/not_embedded.inc
SELECT @@global.performance_schema_show_processlist INTO @save_processlist;
--source include/add_anonymous_users.inc
SET @@global.performance_schema_show_processlist = OFF;
connect (anon,localhost,test,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
SHOW GRANTS;
# Empty
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
# Empty
SELECT * FROM performance_schema.processlist;
--error ER_SPECIFIC_ACCESS_DENIED_ERROR
SHOW PROCESSLIST;
connection default;
SET @@global.performance_schema_show_processlist = ON;
connection anon;
SHOW GRANTS;
# Empty
SELECT * FROM INFORMATION_SCHEMA.PROCESSLIST;
# Empty
SELECT * FROM performance_schema.processlist;
--error ER_SPECIFIC_ACCESS_DENIED_ERROR
SHOW PROCESSLIST;
disconnect anon;
connection default;
GRANT PROCESS ON *.* TO ''@'localhost';
SET @@global.performance_schema_show_processlist = OFF;
connect (anon2,localhost,test,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
SHOW GRANTS;
# Full rows
SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
# Full rows
SELECT count(*) >= 2 FROM performance_schema.processlist;
# Full rows
--disable_result_log
SHOW PROCESSLIST;
--enable_result_log
SELECT "Previous statement is now completed." as status;
connection default;
# Returns ROWS_SENT = 0 even when SHOW PROCESSLIST has rows
SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT as BROKEN_ROWS_SENT
FROM performance_schema.events_statements_history
WHERE SQL_TEXT = "SHOW PROCESSLIST";
connection anon2;
connection default;
TRUNCATE TABLE performance_schema.events_statements_history;
set @@global.performance_schema_show_processlist = ON;
connection anon2;
SHOW GRANTS;
# Full rows
SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
# Full rows
SELECT count(*) >= 2 FROM performance_schema.processlist;
# Full rows
--disable_result_log
SHOW PROCESSLIST;
--enable_result_log
SELECT "Previous statement is now completed." as status;
connection default;
SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT >= 2
FROM performance_schema.events_statements_history
WHERE SQL_TEXT = "SHOW PROCESSLIST";
disconnect anon2;
connection default;
--source include/delete_anonymous_users.inc
SET @@global.performance_schema_show_processlist = @save_processlist;

2
mysql-test/suite/perfschema/t/processlist_no_pfs-master.opt Normal file
View File

@ -0,0 +1,2 @@
--loose-disable-performance-schema
--loose-performance-schema-show-processlist=ON

29
mysql-test/suite/perfschema/t/processlist_no_pfs.test Normal file
View File

@ -0,0 +1,29 @@
# Tests for PERFORMANCE_SCHEMA
--source include/not_embedded.inc
--source ../include/start_server_common.inc
--echo
select * from information_schema.engines
where engine = "PERFORMANCE_SCHEMA";
--echo
--echo # If the Performance Schema is disabled, then expect
--echo # performance-schema-show-processlist = OFF
--echo # regardless of its initial setting
--echo
select @@global.performance_schema_show_processlist;
--echo
--echo # If the Performance Schema is disabled, then setting
--echo # performance-schema-show-processlist = ON
--echo # succeeds, SHOW PROCESSLIST returns no data.
--echo
set @@global.performance_schema_show_processlist = ON;
SHOW PROCESSLIST;
--echo
show global variables like "performance_schema";

1
mysql-test/suite/perfschema/t/processlist_port-master.opt Normal file
View File

@ -0,0 +1 @@
--event-scheduler

162
mysql-test/suite/perfschema/t/processlist_port.test Normal file
View File

@ -0,0 +1,162 @@
--echo ##
--echo ## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
--echo ##
--echo ## Verify the Host field (hostname:port) against the legacy implementation.
--echo ##
--source include/no_protocol.inc
--source include/not_embedded.inc
--echo
--echo ### Setup ###
--echo
select @@global.performance_schema_show_processlist into @save_processlist;
--echo
--echo # Control user
create user user0@localhost;
grant ALL on *.* to user0@localhost;
--echo # Test users
--echo
create user user1@localhost, user2@localhost,
user3@localhost, user4@localhost;
--echo
# Grant no privileges to user1 to ensure only one process
grant USAGE on *.* to user1@localhost;
grant ALL on *.* to user2@localhost;
grant ALL on *.* to user3@localhost;
grant ALL on *.* to user4@localhost;
--echo
flush privileges;
--echo
show grants for user1@localhost;
--echo
--echo # Connect (con_user0, 127.0.0.1, user0, , , MASTER_MYPORT, )
connect (con_user0, 127.0.0.1, user0, , , $MASTER_MYPORT, );
--echo
select connection_id() into @con_user0_id;
--echo # Connect (con_user1, 127.0.0.1, user1, , , MASTER_MYPORT, )
connect (con_user1, 127.0.0.1, user1, , , $MASTER_MYPORT, );
--echo # Connect (con_user2, 127.0.0.1, user2, , , MASTER_MYPORT, )
connect (con_user2, 127.0.0.1, user2, , , $MASTER_MYPORT, );
--echo # Connect (con_user3, 127.0.0.1, user3, , , MASTER_MYPORT, )
connect (con_user3, 127.0.0.1, user3, , , $MASTER_MYPORT, );
--echo # Connect (con_user4, 127.0.0.1, user4, , , MASTER_MYPORT, )
connect (con_user4, 127.0.0.1, user4, , , $MASTER_MYPORT, );
--echo # Connection user0
--connection con_user0
let $wait_condition = select connection_id() = @con_user0_id;
--source include/wait_condition.inc
--echo
--echo ### Compare the SHOW PROCESSLIST Host column between the new and old implementations
--echo
--echo ## New SHOW PROCESSLIST
let $pfs_spl = on;
--source ../include/processlist_set.inc
--source ../include/processlist_load.inc
--echo
--echo # Connection user1
--connection con_user1
--echo # Get Host:Port, new
let $host_new = query_get_value(SHOW FULL PROCESSLIST, Host, 1);
--echo
--echo ## Legacy SHOW PROCESSLIST
--connection con_user0
let $pfs_spl = off;
--source ../include/processlist_set.inc
--source ../include/processlist_load.inc
--echo
--echo # Connection user1
--connection con_user1
--echo # Get Host:Port, legacy
let $host_old = query_get_value(SHOW FULL PROCESSLIST, Host, 1);
--echo
## DEBUG ONLY
## --echo DEBUG: New: $host_new Old: $host_old
if ($host_new == $host_old)
{
--echo ***SUCCESS*** The SHOW PROCESSLIST Host fields match
}
if ($host_new != $host_old)
{
--echo ***ERROR*** SHOW PROCESSLIST Host fields do not match. New: $host_new Old: $host_old
}
--echo
--echo ### Compare the processlist Host column between Performance Schema and the Information Schema
--echo
--echo # Connection con_user0
--connection con_user0
let $count_new = `select count(*) from performance_schema.processlist`;
let $count_old = `select count(*) from information_schema.processlist`;
let $count_join = `select count(*) from performance_schema.processlist pspl
left join information_schema.processlist ispl on pspl.host = ispl.host and pspl.id = ispl.id`;
--echo
if ($count_old == $count_join)
{
--echo ***SUCCESS*** The processlist Host fields match between the Performance Schema and the Information Schema
}
if ($count_old != $count_join)
{
--echo ***ERROR*** The processlist Host fields do not match
--echo Count new: $count_new Count old: $count_old Count join: $count_join
--echo
select * from performance_schema.processlist order by host, id;
--echo
select * from information_schema.processlist order by host, id;
--echo
select * from performance_schema.processlist pspl
left join information_schema.processlist ispl on pspl.host = ispl.host and pspl.id = ispl.id;
}
--echo
--echo
--echo ### Clean up ###
--echo
--echo # Disconnect con_user0
--connection con_user0
--disconnect con_user0
--echo # Disconnect con_user1
--connection con_user1
--disconnect con_user1
--echo # Disconnect con_user2
--connection con_user2
--disconnect con_user2
--echo # Disconnect con_user3
--connection con_user3
--disconnect con_user3
--echo # Disconnect con_user4
--connection con_user4
--disconnect con_user4
--echo # Connection default
--connection default
--echo
drop user user0@localhost;
drop user user1@localhost;
drop user user2@localhost;
drop user user3@localhost;
drop user user4@localhost;
--echo
set @@global.performance_schema_show_processlist = @save_processlist;

134
mysql-test/suite/perfschema/t/processlist_reg_user.test Normal file
View File

@ -0,0 +1,134 @@
--echo ##
--echo ## Test the Performance Schema-based implementation of SHOW PROCESSLIST.
--echo ## Verify behavior for regular users and PROCESS_ACL.
--echo ##
--source include/no_protocol.inc
--source include/not_embedded.inc
SELECT @@global.performance_schema_show_processlist INTO @save_processlist;
--source include/add_anonymous_users.inc
SET @@global.performance_schema_show_processlist = OFF;
CREATE USER 'regular'@'localhost';
connect (reg,localhost,regular,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
SHOW GRANTS;
# Self rows only
SELECT USER, INFO FROM INFORMATION_SCHEMA.PROCESSLIST;
# Self rows only
SELECT USER, INFO FROM performance_schema.processlist;
# Self rows only
--disable_result_log
SHOW PROCESSLIST;
--enable_result_log
SELECT "Previous statement is now completed." as status;
connection default;
# Returns ROWS_SENT = 0 even when SHOW PROCESSLIST has rows
SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT as BROKEN_ROWS_SENT
FROM performance_schema.events_statements_history
WHERE SQL_TEXT = "SHOW PROCESSLIST";
TRUNCATE TABLE performance_schema.events_statements_history;
SET @@global.performance_schema_show_processlist = ON;
connection reg;
SHOW GRANTS;
# Self rows only
SELECT USER, INFO FROM INFORMATION_SCHEMA.PROCESSLIST;
# Self rows only
SELECT USER, INFO FROM performance_schema.processlist;
# Self rows only
--disable_result_log
SHOW PROCESSLIST;
--enable_result_log
SELECT "Previous statement is now completed." as status;
connection default;
SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT
FROM performance_schema.events_statements_history
WHERE SQL_TEXT = "SHOW PROCESSLIST";
TRUNCATE TABLE performance_schema.events_statements_history;
disconnect reg;
GRANT PROCESS ON *.* TO 'regular'@'localhost';
SET @@global.performance_schema_show_processlist = OFF;
connect (reg2,localhost,regular,,test,$MASTER_MYPORT,$MASTER_MYSOCK);
SHOW GRANTS;
# Full rows
SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
# Full rows
SELECT count(*) >= 2 FROM performance_schema.processlist;
# Full rows
--disable_result_log
SHOW PROCESSLIST;
--enable_result_log
SELECT "Previous statement is now completed." as status;
connection default;
# Returns ROWS_SENT = 0 even when SHOW PROCESSLIST has rows
SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT as BROKEN_ROWS_SENT
FROM performance_schema.events_statements_history
WHERE SQL_TEXT = "SHOW PROCESSLIST";
TRUNCATE TABLE performance_schema.events_statements_history;
SET @@global.performance_schema_show_processlist = ON;
connection reg2;
SHOW GRANTS;
# Full rows
SELECT count(*) >= 2 FROM INFORMATION_SCHEMA.PROCESSLIST;
# Full rows
SELECT count(*) >= 2 FROM performance_schema.processlist;
# Full rows
--disable_result_log
SHOW PROCESSLIST;
--enable_result_log
SELECT "Previous statement is now completed." as status;
connection default;
SELECT EVENT_NAME, SQL_TEXT, ROWS_SENT >= 2
FROM performance_schema.events_statements_history
WHERE SQL_TEXT = "SHOW PROCESSLIST";
TRUNCATE TABLE performance_schema.events_statements_history;
disconnect reg2;
--source include/delete_anonymous_users.inc
SET @@global.performance_schema_show_processlist = @save_processlist;
DROP USER 'regular'@'localhost';

6
mysql-test/suite/perfschema/t/threads_mysql.test
View File

@ -35,7 +35,7 @@ SELECT name, type, processlist_user, processlist_host, processlist_db,
processlist_command, processlist_info, connection_type,
IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id')
AS unified_parent_thread_id,
role, instrumented
`role`, instrumented
FROM performance_schema.threads
WHERE name LIKE 'thread/sql%'
ORDER BY name;
@ -54,7 +54,7 @@ SELECT name, type, processlist_user, processlist_host, processlist_db,
processlist_command, processlist_info,
IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id')
AS unified_parent_thread_id,
role, instrumented
`role`, instrumented
FROM performance_schema.threads
WHERE name LIKE 'thread/sql%'
AND thread_id NOT IN (SELECT thread_id FROM t1)
@ -94,7 +94,7 @@ SELECT name, type, processlist_user, processlist_host, processlist_db,
processlist_command, processlist_info,
IF(parent_thread_id IS NULL, parent_thread_id, 'unified parent_thread_id')
AS unified_parent_thread_id,
role, instrumented
`role`, instrumented
FROM performance_schema.threads
WHERE name LIKE 'thread/sql%'
AND thread_id NOT IN (SELECT thread_id FROM t1)

37
mysys/psi_noop.c
View File

@ -1,17 +1,29 @@
/* Copyright (c) 2011, 2016, Oracle and/or its affiliates.
/* Copyright (c) 2011, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; version 2 of the License.
it under the terms of the GNU General Public License, version 2.0,
as published by the Free Software Foundation.
This program is also distributed with certain software (including
but not limited to OpenSSL) that is licensed under separate terms,
as designated in a particular file or component or in included license
documentation. The authors of MySQL hereby grant you an additional
permission to link the program and your derivative works with the
separately licensed software that they have included with MySQL.
Without limiting anything contained in the foregoing, this file,
which is part of C Driver for MySQL (Connector/C), is also subject to the
Universal FOSS Exception, version 1.0, a copy of which can be found at
http://oss.oracle.com/licenses/universal-foss-exception.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
GNU General Public License, version 2.0, for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software Foundation,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1335 USA */
51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
/*
Always provide the noop performance interface, for plugins.
@ -262,6 +274,11 @@ static void set_thread_noop(PSI_thread* thread NNN)
return;
}
static void set_thread_peer_port_noop(PSI_thread * thread NNN, uint port NNN)
{
return;
}
static void delete_current_thread_noop(void)
{
return;
@ -776,9 +793,9 @@ digest_end_noop(PSI_digest_locker *locker NNN,
}
static int
set_thread_connect_attrs_noop(const char *buffer NNN,
uint length NNN,
const void *from_cs NNN)
set_thread_connect_attrs_noop(const char *buffer __attribute__ ((unused)),
uint length __attribute__ ((unused)),
const void *from_cs __attribute__ ((unused)))
{
return 0;
}
@ -1025,7 +1042,9 @@ static PSI PSI_noop=
set_metadata_lock_status_noop,
destroy_metadata_lock_noop,
start_metadata_wait_noop,
end_metadata_wait_noop
end_metadata_wait_noop,
set_thread_peer_port_noop
};
/**

4
storage/perfschema/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (c) 2009, 2021, Oracle and/or its affiliates.
# Copyright (c) 2009, 2022, Oracle and/or its affiliates.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License, version 2.0,
@ -92,6 +92,7 @@ table_esms_by_host_by_event_name.h
table_esms_by_digest.h
table_esms_by_program.h
table_prepared_stmt_instances.h
#table_processlist.h
table_esms_by_thread_by_event_name.h
table_esms_by_user_by_event_name.h
table_esms_global_by_event_name.h
@ -208,6 +209,7 @@ table_esms_by_host_by_event_name.cc
table_esms_by_digest.cc
table_esms_by_program.cc
table_prepared_stmt_instances.cc
#table_processlist.cc
table_esms_by_thread_by_event_name.cc
table_esms_by_user_by_event_name.cc
table_esms_global_by_event_name.cc

2
storage/perfschema/cursor_by_account.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2011, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2011, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/cursor_by_account.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2011, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2011, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/cursor_by_host.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2011, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2011, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/cursor_by_host.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2011, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2011, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/cursor_by_thread.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2011, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2011, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/cursor_by_thread.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2011, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2011, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/cursor_by_thread_connect_attr.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/cursor_by_thread_connect_attr.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2012, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2012, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/cursor_by_user.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2011, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2011, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/cursor_by_user.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2011, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2011, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

49
storage/perfschema/ha_perfschema.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,
@ -444,6 +444,53 @@ THR_LOCK_DATA **ha_perfschema::store_lock(THD *thd,
int ha_perfschema::delete_table(const char *name)
{
DBUG_ENTER("ha_perfschema::delete_table");
/*
The name string looks like:
"./performance_schema/processlist"
Make a copy of it, parse the '/' to
isolate the schema and table name.
*/
char table_path[FN_REFLEN+1];
strncpy(table_path, name, sizeof(table_path));
table_path[FN_REFLEN]='\0';
char *ptr;
char *table_name;
char *db_name;
const PFS_engine_table_share *share;
/* Start scan from the end. */
ptr = strend(table_path) - 1;
/* Find path separator */
while ((ptr >= table_path) && (*ptr != '\\') && (*ptr != '/')) {
ptr--;
}
table_name = ptr + 1;
*ptr = '\0';
/* Find path separator */
while ((ptr >= table_path) && (*ptr != '\\') && (*ptr != '/')) {
ptr--;
}
db_name = ptr + 1;
share = find_table_share(db_name, table_name);
if (share != NULL) {
if (share->m_optional) {
/*
An optional table is deleted,
disarm the checked flag so we don't trust it any more.
*/
share->m_state->m_checked = false;
}
}
DBUG_RETURN(0);
}

2
storage/perfschema/ha_perfschema.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

15
storage/perfschema/pfs.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,
@ -2569,6 +2569,16 @@ void pfs_set_thread_v1(PSI_thread* thread)
my_thread_set_THR_PFS(pfs);
}
/**
Implementation of the thread instrumentation interface.
*/
void pfs_set_thread_peer_port_v1(PSI_thread *thread, uint port) {
PFS_thread *pfs = reinterpret_cast<PFS_thread *>(thread);
if (likely(pfs != NULL)) {
pfs->m_peer_port = port;
}
}
/**
Implementation of the thread instrumentation interface.
@sa PSI_v1::delete_current_thread.
@ -7136,7 +7146,8 @@ PSI_v1 PFS_v1=
pfs_set_metadata_lock_status_v1,
pfs_destroy_metadata_lock_v1,
pfs_start_metadata_wait_v1,
pfs_end_metadata_wait_v1
pfs_end_metadata_wait_v1,
pfs_set_thread_peer_port_v1
};
static void* get_interface(int version)

2
storage/perfschema/pfs.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

25
storage/perfschema/pfs_account.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,
@ -526,31 +526,19 @@ void PFS_account::aggregate_memory(bool alive, PFS_user *safe_user, PFS_host *sa
}
void PFS_account::aggregate_status(PFS_user *safe_user, PFS_host *safe_host)
{
if (likely(safe_user != NULL && safe_host != NULL))
{
/*
Aggregate STATUS_BY_ACCOUNT to:
- STATUS_BY_USER
- STATUS_BY_HOST
Never aggregate to global_status_var,
because of the parallel THD -> global_status_var flow.
*/
safe_user->m_status_stats.aggregate(& m_status_stats);
safe_host->m_status_stats.aggregate(& m_status_stats);
m_status_stats.reset();
return;
}
if (safe_user != NULL)
{
/*
Aggregate STATUS_BY_ACCOUNT to:
- STATUS_BY_USER
- GLOBAL_STATUS
*/
safe_user->m_status_stats.aggregate(& m_status_stats);
//m_status_stats.aggregate_to(& global_status_var);
m_status_stats.reset();
return;
}
if (safe_host != NULL)
@ -560,15 +548,8 @@ void PFS_account::aggregate_status(PFS_user *safe_user, PFS_host *safe_host)
- STATUS_BY_HOST
*/
safe_host->m_status_stats.aggregate(& m_status_stats);
m_status_stats.reset();
return;
}
/*
Aggregate STATUS_BY_ACCOUNT to:
- GLOBAL_STATUS
*/
//m_status_stats.aggregate_to(& global_status_var);
m_status_stats.reset();
return;
}

2
storage/perfschema/pfs_account.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_atomic.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2009, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2009, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_autosize.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2012, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2012, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_buffer_container.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2014, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2014, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_buffer_container.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2014, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2014, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_builtin_memory.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2014, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2014, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_builtin_memory.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2014, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2014, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_column_types.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_column_values.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_column_values.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_con_slice.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_con_slice.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_defaults.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_defaults.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_digest.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_digest.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2011, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2011, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

48
storage/perfschema/pfs_engine_table.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,
@ -48,6 +48,7 @@
#include "table_file_summary_by_instance.h"
#include "table_file_summary_by_event_name.h"
#include "table_threads.h"
//#include "table_processlist.h"
#include "table_ews_by_host_by_event_name.h"
#include "table_ews_by_user_by_event_name.h"
@ -333,9 +334,27 @@ static PFS_engine_table_share *all_shares[]=
//&table_global_variables::m_share,
//&table_session_variables::m_share,
//&table_processlist::m_share,
NULL
};
/** Error reporting for schema integrity checks. */
class PFS_silent_check_intact : public Table_check_intact
{
protected:
virtual void report_error(uint code, const char *fmt, ...) {}
public:
PFS_silent_check_intact()
{}
~PFS_silent_check_intact()
{}
};
/** Initialize all the table share locks. */
void PFS_engine_table_share::init_all_locks(void)
{
@ -770,6 +789,33 @@ PFS_readonly_world_acl::check(privilege_t want_access, privilege_t *save_priv) c
return res;
}
PFS_readonly_processlist_acl pfs_readonly_processlist_acl;
ACL_internal_access_result PFS_readonly_processlist_acl::check(
privilege_t want_access, privilege_t *save_priv) const {
ACL_internal_access_result res =
PFS_readonly_acl::check(want_access, save_priv);
if ((res == ACL_INTERNAL_ACCESS_CHECK_GRANT) && (want_access == SELECT_ACL)) {
THD *thd = current_thd;
if (thd != NULL) {
if (thd->lex->sql_command == SQLCOM_SHOW_PROCESSLIST ||
thd->lex->sql_command == SQLCOM_SELECT) {
/*
For compatibility with the historical
SHOW PROCESSLIST command,
SHOW PROCESSLIST does not require a
SELECT privilege on table performance_schema.processlist,
when rewriting the query using table processlist.
*/
return ACL_INTERNAL_ACCESS_GRANTED;
}
}
}
return res;
}
PFS_truncatable_acl pfs_truncatable_acl;

32
storage/perfschema/pfs_engine_table.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,
@ -286,6 +286,11 @@ typedef int (*pfs_delete_all_rows_t)(void);
/** Callback to get a row count. */
typedef ha_rows (*pfs_get_row_count_t)(void);
struct PFS_engine_table_share_state {
/** Schema integrity flag. */
bool m_checked;
};
/**
A PERFORMANCE_SCHEMA table share.
This data is shared by all the table handles opened on the same table.
@ -319,6 +324,10 @@ struct PFS_engine_table_share
LEX_STRING sql;
/** Table is available even if the Performance Schema is disabled. */
bool m_perpetual;
/** Table is optional. */
bool m_optional;
/** Dynamic state. */
PFS_engine_table_share_state *m_state;
};
/**
@ -354,7 +363,7 @@ public:
~PFS_truncatable_acl()
{}
ACL_internal_access_result check(privilege_t want_access,
virtual ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
};
@ -459,6 +468,25 @@ public:
extern PFS_truncatable_world_acl pfs_truncatable_world_acl;
/**
Privileges for readable processlist tables.
*/
class PFS_readonly_processlist_acl : public PFS_readonly_acl {
public:
PFS_readonly_processlist_acl()
{}
~PFS_readonly_processlist_acl()
{}
virtual ACL_internal_access_result check(privilege_t want_access,
privilege_t *save_priv) const;
};
/** Singleton instance of PFS_readonly_processlist_acl */
extern PFS_readonly_processlist_acl pfs_readonly_processlist_acl;
/** Position of a cursor, for simple iterations. */
struct PFS_simple_index
{

2
storage/perfschema/pfs_events.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_events_stages.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_events_stages.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_events_statements.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_events_statements.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_events_transactions.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2013, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2013, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_events_transactions.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2013, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2013, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_events_waits.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_events_waits.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates..
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates..
Copyright (c) 2017, 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify

2
storage/perfschema/pfs_global.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates. All rights
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates. All rights
reserved.
This program is free software; you can redistribute it and/or modify

2
storage/perfschema/pfs_global.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_host.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

2
storage/perfschema/pfs_host.h
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2010, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2010, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,

4
storage/perfschema/pfs_instr.cc
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2008, 2021, Oracle and/or its affiliates.
/* Copyright (c) 2008, 2022, Oracle and/or its affiliates.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License, version 2.0,
@ -576,6 +576,8 @@ PFS_thread* create_thread(PFS_thread_class *klass, const void *identity,
pfs->m_account= NULL;
set_thread_account(pfs);
pfs->m_peer_port = 0;
/*
For child waits, by default,
- NESTING_EVENT_ID is NULL

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