database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge parallel replication async deadlock kill into 10.2.

Browse Source 
Conflicts:
	sql/mysqld.cc
	sql/slave.cc
This commit is contained in:
Kristian Nielsen
2016-09-09 12:15:53 +02:00
parent 06b7fce9f2 7e0c9de864
commit ec47beaba6
9 changed files with 270 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/sql_class.h
View File

@ -1529,7 +1529,8 @@ enum enum_thread_type
SYSTEM_THREAD_EVENT_SCHEDULER= 8,
SYSTEM_THREAD_EVENT_WORKER= 16,
SYSTEM_THREAD_BINLOG_BACKGROUND= 32,
SYSTEM_THREAD_SLAVE_INIT= 64
SYSTEM_THREAD_SLAVE_INIT= 64,
SYSTEM_THREAD_SLAVE_BACKGROUND= 128
};
inline char const *