diff options
author | unknown <serg@serg.mylan> | 2004-04-02 23:50:41 +0200 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2004-04-02 23:50:41 +0200 |
commit | 6b433f99a4dd717e3274c26f5727c6aa14663f75 (patch) | |
tree | 50c9a9de7e7a6d6ad79986d1c33e9df44a9490b4 /sql/sql_load.cc | |
parent | 8abda715d4d6bf75bb4470c7acc86b9dd224012e (diff) | |
parent | b2cf48ab5aded5cfd14351b1a97a47af0b3615a3 (diff) | |
download | mariadb-git-6b433f99a4dd717e3274c26f5727c6aa14663f75.tar.gz |
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
sql/ha_myisam.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/sql_load.cc')
-rw-r--r-- | sql/sql_load.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index e3b32f694da..7b7ed2e96d0 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -280,7 +280,6 @@ 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)); - table->bulk_insert= 1; if (handle_duplicates == DUP_IGNORE || handle_duplicates == DUP_REPLACE) table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); |