diff options
| author | unknown <ibabaev@bk-internal.mysql.com> | 2007-06-01 06:33:37 +0200 |
|---|---|---|
| committer | unknown <ibabaev@bk-internal.mysql.com> | 2007-06-01 06:33:37 +0200 |
| commit | 81ffede7fc31c092e618469d961600d70831c863 (patch) | |
| tree | b88163902b6698fd82cc842101cfa02e2bf660dd /sql/sp_head.cc | |
| parent | c6ff8a6500f6e3e08d01fcf0687f6987e5adefa6 (diff) | |
| parent | 5d5c66fb66f2c587ce270b624c39662763fa7417 (diff) | |
| download | mariadb-git-81ffede7fc31c092e618469d961600d70831c863.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
client/mysqldump.c:
Auto merged
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/field_conv.cc:
Auto merged
sql/handler.h:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_func.cc:
Auto merged
sql/item_func.h:
Auto merged
sql/item_subselect.cc:
Auto merged
sql/item_sum.cc:
Auto merged
sql/item_timefunc.cc:
Auto merged
sql/my_decimal.h:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_view.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
strings/decimal.c:
Auto merged
sql/sql_update.cc:
Manual merge
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 7fa267f1b40..482291e3a9f 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1349,6 +1349,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); } |