summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-06-09 11:41:24 +0300
committerGeorgi Kodinov <Georgi.Kodinov@Oracle.com>2010-06-09 11:41:24 +0300
commitfdbef84347f775c7a2ce44ef41a744df5201f4e0 (patch)
tree2b69f5dc4ed6a2fca5bff6279464516aad56386b /sql/sql_load.cc
parent43316c794ad497f63d92f21f818e9599d642f772 (diff)
parent5932330839daa3c211b7db81d0ce1b50b8b928f8 (diff)
downloadmariadb-git-fdbef84347f775c7a2ce44ef41a744df5201f4e0.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 2c42f29ae71..7e540ffbe4b 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -995,6 +995,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)