diff options
author | evgen@moonbone.local <> | 2007-05-23 23:31:33 +0400 |
---|---|---|
committer | evgen@moonbone.local <> | 2007-05-23 23:31:33 +0400 |
commit | 559063177f7d2c06394a484500eec873efd706af (patch) | |
tree | ff5341dda3dfecc65855c4a3f48ab54289ac810e /sql/sp_head.cc | |
parent | debb054d4a155a8d70f3431cd281901fd210a98e (diff) | |
parent | d1d58b5f1d9a0bee5651217809f4ad61a0c44d5a (diff) | |
download | mariadb-git-559063177f7d2c06394a484500eec873efd706af.tar.gz |
Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/27563-bug-5.0-opt-mysql
Diffstat (limited to 'sql/sp_head.cc')
-rw-r--r-- | sql/sp_head.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 835d8bf038f..a3c3566926a 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1321,6 +1321,9 @@ err_with_cleanup: free_root(&call_mem_root, MYF(0)); thd->spcont= octx; + if (thd->killed) + thd->send_kill_message(); + DBUG_RETURN(err_status); } |