diff options
| author | unknown <mskold@mysql.com> | 2004-09-08 11:50:17 +0200 |
|---|---|---|
| committer | unknown <mskold@mysql.com> | 2004-09-08 11:50:17 +0200 |
| commit | 7b98930a2ab346a95b611c8a7bc9f6edfaaa3cae (patch) | |
| tree | 579c11e3d6f31b0a968df39595e1c14caee51024 /sql | |
| parent | d69d79377c1ca3e5c60f60c535292f65bef19110 (diff) | |
| download | mariadb-git-7b98930a2ab346a95b611c8a7bc9f6edfaaa3cae.tar.gz | |
Modified bulk load to allow ndbcluster to flush transactions
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_load.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 1ad9a6aa952..1ba96fa3663 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -271,6 +271,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, if (handle_duplicates == DUP_IGNORE || handle_duplicates == DUP_REPLACE) table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); + ha_enable_transaction(thd, FALSE); table->file->start_bulk_insert((ha_rows) 0); table->copy_blobs=1; if (!field_term->length() && !enclosed->length()) @@ -281,6 +282,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, skip_lines); if (table->file->end_bulk_insert()) error=1; /* purecov: inspected */ + ha_enable_transaction(thd, TRUE); table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY); table->next_number_field=0; } |