summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorunknown <tomas@poseidon.ndb.mysql.com>2006-02-07 00:03:39 +0100
committerunknown <tomas@poseidon.ndb.mysql.com>2006-02-07 00:03:39 +0100
commitee213a0357d3a4eb6a526f7d3160f8e04c41aec7 (patch)
tree0283b4f66e5d11ac31e040752e9f7c5ce4ffc3e7 /sql/sql_load.cc
parent81236ac4eebb9731b748e73d2377939eec188034 (diff)
downloadmariadb-git-ee213a0357d3a4eb6a526f7d3160f8e04c41aec7.tar.gz
Bug #17154 load data infile of char values into a table of char(PK) hangs
Bug #17158 load data infile of char values into table of char with no (PK) fails to load Bug #17081 Doing "LOAD DATA INFILE" directly after delete can cause missing data mysql-test/r/ndb_load.result: New BitKeeper file ``mysql-test/r/ndb_load.result'' mysql-test/t/ndb_load.test: New BitKeeper file ``mysql-test/t/ndb_load.test''
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc7
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index aa4ea3e6c8c..4e6c458cc43 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -285,8 +285,11 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
else
error=read_sep_field(thd,info,table,fields,read_info,*enclosed,
skip_lines);
- if (table->file->end_bulk_insert())
- error=1; /* purecov: inspected */
+ if (table->file->end_bulk_insert() && !error)
+ {
+ table->file->print_error(my_errno, MYF(0));
+ error= 1;
+ }
table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
table->next_number_field=0;
}