diff options
| author | unknown <konstantin@mysql.com> | 2006-03-30 19:12:10 +0400 |
|---|---|---|
| committer | unknown <konstantin@mysql.com> | 2006-03-30 19:12:10 +0400 |
| commit | fb5677b8a074deac0e49cdb2ace94e135f519ea0 (patch) | |
| tree | 8bbe00a4d37aaed1e1f6659f17249b7bea7cada5 /sql/sql_load.cc | |
| parent | 2c550bafbf55cab8f87624d4566cad143f164edb (diff) | |
| parent | d9f5fac9ed584791e96ad16bb68d247eafb9dfd5 (diff) | |
| download | mariadb-git-fb5677b8a074deac0e49cdb2ace94e135f519ea0.tar.gz | |
Merge mysql.com:/opt/local/work/tmp_merge2
into mysql.com:/opt/local/work/mysql-5.1-merge
mysql-test/r/ps.result:
Auto merged
mysql-test/r/sp-error.result:
Auto merged
mysql-test/r/sp-prelocking.result:
Auto merged
mysql-test/r/sp.result:
Auto merged
mysql-test/r/trigger.result:
Auto merged
mysql-test/t/ps.test:
Auto merged
mysql-test/t/sp-error.test:
Auto merged
mysql-test/t/sp.test:
Auto merged
mysql-test/t/trigger.test:
Auto merged
sql/field.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/sql_view.cc:
Auto merged
mysql-test/t/sp-prelocking.test:
Manual merge.
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 9fcdc969597..599480e616c 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -367,7 +367,8 @@ bool mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, if (ignore || handle_duplicates == DUP_REPLACE) table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); - table->file->start_bulk_insert((ha_rows) 0); + if (!thd->prelocked_mode) + table->file->start_bulk_insert((ha_rows) 0); table->copy_blobs=1; thd->no_trans_update= 0; @@ -384,7 +385,7 @@ 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) + if (!thd->prelocked_mode && table->file->end_bulk_insert() && !error) { table->file->print_error(my_errno, MYF(0)); error= 1; |