diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-01-26 22:54:27 -0500 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-01-26 22:54:27 -0500 |
| commit | 7cda4bee0ef7c8a3ec85e94bc1443ceaba3a64e8 (patch) | |
| tree | f8c1f556f36f026038015e7215ae88b0cb7b1ce5 /sql/mdl.cc | |
| parent | ea229eb6bb29ee7b11a7d28a7d4c80a593cb1d3b (diff) | |
| parent | fb71449b10100e9a0f887b1585000fbfab294f3c (diff) | |
| download | mariadb-git-7cda4bee0ef7c8a3ec85e94bc1443ceaba3a64e8.tar.gz | |
maria-10.0.16 merge
bzr merge -r4588 maria/10.0
Diffstat (limited to 'sql/mdl.cc')
| -rw-r--r-- | sql/mdl.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/mdl.cc b/sql/mdl.cc index 5755b2bbfd5..4c962d3c570 100644 --- a/sql/mdl.cc +++ b/sql/mdl.cc @@ -2517,6 +2517,7 @@ MDL_context::acquire_lock(MDL_request *mdl_request, ulong lock_wait_timeout) my_error(ER_LOCK_WAIT_TIMEOUT, MYF(0)); break; case MDL_wait::KILLED: + get_thd()->send_kill_message(); break; default: DBUG_ASSERT(0); |