summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorhf@deer.mysql.r18.ru <>2003-04-08 19:43:24 +0500
committerhf@deer.mysql.r18.ru <>2003-04-08 19:43:24 +0500
commit5d4e9f95f2bdaff5d57b217fbb788fcea0144734 (patch)
tree01d8c458001514d5c89684a3b748ad31483c8557 /sql/sql_load.cc
parent462430ba558f047c8792ff577b45077aa332856a (diff)
parent0428d08606269faf5eddd5740b5f9e80abfacbe4 (diff)
downloadmariadb-git-5d4e9f95f2bdaff5d57b217fbb788fcea0144734.tar.gz
Merging
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index b46973f91f2..f030fe5e001 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -376,7 +376,7 @@ read_fixed_length(THD *thd,COPY_INFO &info,TABLE *table,List<Item> &fields,
{
if (thd->killed)
{
- my_error(ER_SERVER_SHUTDOWN,MYF(0));
+ thd->send_kill_message();
DBUG_RETURN(1);
}
it.rewind();
@@ -450,7 +450,7 @@ read_sep_field(THD *thd,COPY_INFO &info,TABLE *table,
{
if (thd->killed)
{
- my_error(ER_SERVER_SHUTDOWN,MYF(0));
+ thd->send_kill_message();
DBUG_RETURN(1);
}
while ((sql_field=(Item_field*) it++))