Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
cfdb6212
Commit
cfdb6212
authored
Apr 08, 2022
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-28255 "Error" instead of NULL in P_S.THREADS_CONNECTION_TYPE for background threads
use vio_type_names[] values as in MySQL
parent
d8463b64
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
mysql-test/suite/perfschema/r/threads_mysql.result
mysql-test/suite/perfschema/r/threads_mysql.result
+6
-2
mysql-test/suite/perfschema/t/threads_mysql.test
mysql-test/suite/perfschema/t/threads_mysql.test
+1
-1
vio/viosocket.c
vio/viosocket.c
+1
-1
No files found.
mysql-test/suite/perfschema/r/threads_mysql.result
View file @
cfdb6212
SET GLOBAL event_scheduler = OFF;
SELECT name, type, processlist_user, processlist_host, processlist_db,
processlist_command, processlist_info,
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
...
...
@@ -14,6 +14,7 @@ processlist_host NULL
processlist_db mysql
processlist_command NULL
processlist_info NULL
connection_type NULL
unified_parent_thread_id NULL
role NULL
instrumented YES
...
...
@@ -24,6 +25,7 @@ processlist_host NULL
processlist_db NULL
processlist_command NULL
processlist_info NULL
connection_type NULL
unified_parent_thread_id unified parent_thread_id
role NULL
instrumented YES
...
...
@@ -34,13 +36,14 @@ processlist_host localhost
processlist_db test
processlist_command Query
processlist_info SELECT name, type, processlist_user, processlist_host, processlist_db,
processlist_command, processlist_info,
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
FROM performance_schema.threads
WHERE name LIKE 'thread/sql%'
ORDER BY name
connection_type Socket
unified_parent_thread_id unified parent_thread_id
role NULL
instrumented YES
...
...
@@ -51,6 +54,7 @@ processlist_host NULL
processlist_db NULL
processlist_command NULL
processlist_info NULL
connection_type NULL
unified_parent_thread_id unified parent_thread_id
role NULL
instrumented YES
...
...
mysql-test/suite/perfschema/t/threads_mysql.test
View file @
cfdb6212
...
...
@@ -32,7 +32,7 @@ SET GLOBAL event_scheduler = OFF;
# Therefore we have to disable this protocol for the next statement.
--
disable_ps_protocol
SELECT
name
,
type
,
processlist_user
,
processlist_host
,
processlist_db
,
processlist_command
,
processlist_info
,
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
...
...
vio/viosocket.c
View file @
cfdb6212
...
...
@@ -647,7 +647,7 @@ enum enum_vio_type vio_type(Vio* vio)
static
const
LEX_CSTRING
vio_type_names
[]
=
{
{
STRING_WITH_LEN
(
"
Error"
)
},
// cannot happen
{
STRING_WITH_LEN
(
"
"
)
},
// internal threads
{
STRING_WITH_LEN
(
"TCP/IP"
)
},
{
STRING_WITH_LEN
(
"Socket"
)
},
{
STRING_WITH_LEN
(
"Named Pipe"
)
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment