diff options
| author | unknown <serg@serg.mylan> | 2004-04-07 16:04:28 +0200 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2004-04-07 16:04:28 +0200 |
| commit | 736853e501181c33e692653d00d7a84c6ff68f25 (patch) | |
| tree | 468a8a5c24e34ef26c95a8deb8a952e75ddb5ca1 /sql/sql_load.cc | |
| parent | c62705434021f8ed7b7cfdf9dbba5b1751ebd6f2 (diff) | |
| download | mariadb-git-736853e501181c33e692653d00d7a84c6ff68f25.tar.gz | |
post-review fixes
HA_EXTRA_WRITE_CACHE now part of start_bulk_insert()
test cleanups
BitKeeper/deleted/.del-repair_part2-master.sh~f44a8c15d6c36585:
Delete: mysql-test/t/repair_part2-master.sh
BitKeeper/deleted/.del-repair_part2.test~c20f60783b04d001:
Delete: mysql-test/t/repair_part2.test
BitKeeper/deleted/.del-repair_part2.result~72ca166fb248b566:
Delete: mysql-test/r/repair_part2.result
mysql-test/r/myisam.result:
updated
mysql-test/t/lowercase_table2.test:
typo fixed
mysql-test/r/repair.result:
single repair.test from repair_part[12].test
mysql-test/t/lowercase_table3.test:
typo fixed
mysql-test/t/lowercase_table_qcache.test:
newline added
mysql-test/t/myisam.test:
updated
mysql-test/t/repair.test:
single repair.test from repair_part[12].test
sql/field.cc:
reverted
sql/field.h:
style fix
sql/ha_myisam.cc:
add HA_EXTRA_WRITE_CACHE to start_bulk_insert
sql/sql_insert.cc:
add HA_EXTRA_WRITE_CACHE to start_bulk_insert
sql/sql_load.cc:
add HA_EXTRA_WRITE_CACHE to start_bulk_insert
sql/sql_table.cc:
add HA_EXTRA_WRITE_CACHE to start_bulk_insert
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index f0b6b90dc84..3d9299ca05c 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -276,10 +276,8 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, { if (use_timestamp) table->timestamp_default_now= table->timestamp_on_update_now= 0; - + table->next_number_field=table->found_next_number_field; - VOID(table->file->extra_opt(HA_EXTRA_WRITE_CACHE, - thd->variables.read_buff_size)); if (handle_duplicates == DUP_IGNORE || handle_duplicates == DUP_REPLACE) table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); @@ -291,8 +289,6 @@ 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->extra(HA_EXTRA_NO_CACHE)) - error=1; /* purecov: inspected */ if (table->file->end_bulk_insert()) error=1; /* purecov: inspected */ table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY); |