summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
diff options
context:
space:
mode:
authorunknown <monty@mashka.mysql.fi>2002-09-18 21:04:49 +0300
committerunknown <monty@mashka.mysql.fi>2002-09-18 21:04:49 +0300
commit83fc12f21653f1e6fc12c61791f4e6f2dd87be96 (patch)
tree83f34b98c4e43e4f23f9b941d93676b65ef1b657 /sql/sql_load.cc
parentaef675029f198c61a1a1c46dbb68890f705d40db (diff)
downloadmariadb-git-83fc12f21653f1e6fc12c61791f4e6f2dd87be96.tar.gz
Added code to flush a bulk_insert index.
This fixes a bug when doing multi-row inserts on table with an auto_increment key that is not in the first key segment. Docs/manual.texi: Changelog include/my_base.h: Added code to flush a bulk_insert index myisam/mi_extra.c: Added code to flush a bulk_insert index mysql-test/r/insert.result: test of auto_increment and bulk_insert mysql-test/t/insert.test: test of auto_increment and bulk_insert sql/ha_myisam.cc: Added code to flush a bulk_insert index sql/sql_insert.cc: Mark that bulk_insert is used sql/sql_load.cc: Mark that bulk_insert is used Remove duplicated call to initialize bulk insert sql/table.h: Mark that bulk_insert is used vio/viosslfactories.c: Remove compiler warning
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r--sql/sql_load.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc
index 50e0ea9d5c8..8881c79eba4 100644
--- a/sql/sql_load.cc
+++ b/sql/sql_load.cc
@@ -248,8 +248,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list,
table->next_number_field=table->found_next_number_field;
VOID(table->file->extra_opt(HA_EXTRA_WRITE_CACHE,
thd->variables.read_buff_size));
- VOID(table->file->extra_opt(HA_EXTRA_BULK_INSERT_BEGIN,
- thd->variables.bulk_insert_buff_size));
+ table->bulk_insert= 1;
if (handle_duplicates == DUP_IGNORE ||
handle_duplicates == DUP_REPLACE)
table->file->extra(HA_EXTRA_IGNORE_DUP_KEY);