diff options
| author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-02-07 00:06:28 +0100 |
|---|---|---|
| committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-02-07 00:06:28 +0100 |
| commit | 79cc96647afbc74af1059df4751b0236cd7ff398 (patch) | |
| tree | b9533ddc22ac9fb0f670dedf7771da617616a0b8 /sql/sql_load.cc | |
| parent | 2ba25676d7d835d53f591b8d8eb4cde84445b313 (diff) | |
| parent | 8deb6616bc80eb883b6243077acd9a01ae5fae03 (diff) | |
| download | mariadb-git-79cc96647afbc74af1059df4751b0236cd7ff398.tar.gz | |
Merge poseidon.ndb.mysql.com:/home/tomas/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_load.cc:
Auto merged
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; } |