diff options
| author | unknown <evgen@moonbone.local> | 2007-05-23 23:31:33 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-05-23 23:31:33 +0400 |
| commit | c57d6f729db784d02a0d0d62f1f9d03ab22fcfda (patch) | |
| tree | ff5341dda3dfecc65855c4a3f48ab54289ac810e /sql/item_func.cc | |
| parent | f7f593ae7dde682e449fe81d946a83f74f0deb6a (diff) | |
| parent | 1734b4e99068a135c0b7d49f8bb3b463b3cb0ef3 (diff) | |
| download | mariadb-git-c57d6f729db784d02a0d0d62f1f9d03ab22fcfda.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
sql/item_func.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 1bd41cf87a4..12ec3bd54ac 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -5347,6 +5347,8 @@ Item_func_sp::execute() { null_value= 1; context->process_error(thd); + if (thd->killed) + thd->send_kill_message(); return TRUE; } |