diff options
| author | unknown <ibabaev@bk-internal.mysql.com> | 2007-05-28 06:25:03 +0200 |
|---|---|---|
| committer | unknown <ibabaev@bk-internal.mysql.com> | 2007-05-28 06:25:03 +0200 |
| commit | 7c5aa30f04d483f6d9d647277e5a22c992c5fea3 (patch) | |
| tree | dedeeb2e328311c46256740fa901059742ffb8f4 /sql/item_func.cc | |
| parent | 1d985e48c8fbbd2e6ca9c85e327658430fb39086 (diff) | |
| parent | 1e40d3259bc9e8137dc4697502b0a98357692825 (diff) | |
| download | mariadb-git-7c5aa30f04d483f6d9d647277e5a22c992c5fea3.tar.gz | |
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-opt
BitKeeper/deleted/.del-ps_6bdb.result:
Auto merged
client/mysqldump.c:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/ps_2myisam.result:
Auto merged
mysql-test/r/ps_3innodb.result:
Auto merged
mysql-test/r/ps_4heap.result:
Auto merged
mysql-test/r/ps_5merge.result:
Auto merged
mysql-test/r/ps_7ndb.result:
Auto merged
sql/field.h:
Auto merged
sql/item_func.cc:
Auto merged
sql/my_decimal.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_table.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 271b4d784e7..906a87730be 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -5318,6 +5318,8 @@ Item_func_sp::execute() { null_value= 1; context->process_error(thd); + if (thd->killed) + thd->send_kill_message(); return TRUE; } |