mirror of
https://github.com/MariaDB/server.git
synced 2025-07-27 18:02:13 +03:00
Merge branch 'merge-perfschema-5.7' into 10.5
This commit is contained in:
@ -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)
|
||||
|
Reference in New Issue
Block a user