diff options
| author | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-09-09 12:15:53 +0200 |
|---|---|---|
| committer | Kristian Nielsen <knielsen@knielsen-hq.org> | 2016-09-09 12:15:53 +0200 |
| commit | ec47beaba6d3db86bf7eb75045a8d54d875d6962 (patch) | |
| tree | f48a3219e65d0c01b45713a2cb0915d5e06e7f8f /mysql-test | |
| parent | 06b7fce9f24116080168b924d17f71b979fc3a14 (diff) | |
| parent | 7e0c9de86484815b6e014ce3ad3e3a9b74ec0ce0 (diff) | |
| download | mariadb-git-ec47beaba6d3db86bf7eb75045a8d54d875d6962.tar.gz | |
Merge parallel replication async deadlock kill into 10.2.
Conflicts:
sql/mysqld.cc
sql/slave.cc
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/perfschema/r/threads_mysql.result | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/mysql-test/suite/perfschema/r/threads_mysql.result b/mysql-test/suite/perfschema/r/threads_mysql.result index 6ab0b0641b0..9f9c46fe6a6 100644 --- a/mysql-test/suite/perfschema/r/threads_mysql.result +++ b/mysql-test/suite/perfschema/r/threads_mysql.result @@ -44,6 +44,16 @@ processlist_info NULL unified_parent_thread_id unified parent_thread_id role NULL instrumented YES +name thread/sql/slave_background +type BACKGROUND +processlist_user NULL +processlist_host NULL +processlist_db NULL +processlist_command NULL +processlist_info NULL +unified_parent_thread_id unified parent_thread_id +role NULL +instrumented YES CREATE TEMPORARY TABLE t1 AS SELECT thread_id FROM performance_schema.threads WHERE name LIKE 'thread/sql%'; @@ -105,4 +115,5 @@ parent_thread_name child_thread_name thread/sql/event_scheduler thread/sql/event_worker thread/sql/main thread/sql/one_connection thread/sql/main thread/sql/signal_handler +thread/sql/main thread/sql/slave_background thread/sql/one_connection thread/sql/event_scheduler |