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 /sql/sql_table.cc | |
| 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 'sql/sql_table.cc')
0 files changed, 0 insertions, 0 deletions