summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-06-09 11:29:27 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-06-09 11:29:27 +0300
commit04f4786c081d4aa09ae91692bc494c8fd3cc3430 (patch)
tree19f359486b756ba2484cb3d73d7ab22800675688 /sql/sql_load.cc
parent75a18e24fa72cca07254cbabd119b944c0ef989d (diff)
parent287fa3caf532509d01d92e8d32f2149603914137 (diff)
downloadmariadb-git-04f4786c081d4aa09ae91692bc494c8fd3cc3430.tar.gz
Merge
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 6628cc4e8bb..552473e4fc2 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -933,6 +933,10 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
DBUG_RETURN(1);
}
}
+
+ if (thd->is_error())
+ read_info.error= 1;
+
if (read_info.error)
break;
if (skip_lines)