diff options
| author | tomas@poseidon.ndb.mysql.com <> | 2006-02-07 00:06:28 +0100 |
|---|---|---|
| committer | tomas@poseidon.ndb.mysql.com <> | 2006-02-07 00:06:28 +0100 |
| commit | 3f6671d72af955df33efceee53671e9651a1ada2 (patch) | |
| tree | b9533ddc22ac9fb0f670dedf7771da617616a0b8 /sql/sql_load.cc | |
| parent | b25b4e9b5ef14735d1576e0ff7047d0af4bcbc76 (diff) | |
| parent | 5bbb5c29b79432ccc76b43ad0019012f007b3670 (diff) | |
| download | mariadb-git-3f6671d72af955df33efceee53671e9651a1ada2.tar.gz | |
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 4f3bfee5d3a..cc724c102a4 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -373,8 +373,11 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, error= read_sep_field(thd, info, table_list, fields_vars, set_fields, set_values, read_info, *enclosed, skip_lines, ignore); - 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; } |