diff options
author | unknown <tomas@poseidon.ndb.mysql.com> | 2006-02-07 00:03:39 +0100 |
---|---|---|
committer | unknown <tomas@poseidon.ndb.mysql.com> | 2006-02-07 00:03:39 +0100 |
commit | 8deb6616bc80eb883b6243077acd9a01ae5fae03 (patch) | |
tree | 0283b4f66e5d11ac31e040752e9f7c5ce4ffc3e7 /sql/sql_load.cc | |
parent | 1076e176ce965a9d37fcdc71e6eb3447c3931005 (diff) | |
download | mariadb-git-8deb6616bc80eb883b6243077acd9a01ae5fae03.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.cc | 7 |
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; } |