diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-09-26 23:54:00 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-09-26 23:54:00 +0300 |
| commit | c85d1efc82ef9c946d77424ab58e4e760a392822 (patch) | |
| tree | 44adbb2ba60761aee046df6fd57109fa79762711 /sql/slave.cc | |
| parent | 5c8305651d171fb627adc7907ebfb4db5ea1e57b (diff) | |
| parent | 7800d93bc3caca0143334941f626dc6aa3ff2b26 (diff) | |
| download | mariadb-git-c85d1efc82ef9c946d77424ab58e4e760a392822.tar.gz | |
Automatic merge
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index aa8b4ba920b..cb93cf93081 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -524,7 +524,7 @@ terminate_slave_thread(THD *thd, IF_DBUG(int err= ) pthread_kill(thd->real_id, thr_client_alarm); DBUG_ASSERT(err != EINVAL); #endif - thd->awake(THD::NOT_KILLED); + thd->awake(KILL_CONNECTION); pthread_mutex_unlock(&thd->LOCK_thd_data); /* |