diff options
| author | monty@hundin.mysql.fi <> | 2001-09-02 13:47:00 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-09-02 13:47:00 +0300 |
| commit | 04ec0de7d0df99b18aabad7a8edd551483f09f3d (patch) | |
| tree | e5581eaf73302fbd721a4c17983fb6fdfca266d0 /sql/sql_load.cc | |
| parent | 22dbb425aea46169cf7f98dfacbf2244ab19ce0d (diff) | |
| download | mariadb-git-04ec0de7d0df99b18aabad7a8edd551483f09f3d.tar.gz | |
Changed DB_TYPE_INNOBASE to DB_TYPE_INNODB
Fix that DROP DATABASE works with all table types
Use BULK_INSERT when inserting more than one row
Better TRUNCATE TABLE
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 5b02586a24c..d7f273bfaa4 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -243,6 +243,7 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, table->time_stamp=0; table->next_number_field=table->found_next_number_field; VOID(table->file->extra(HA_EXTRA_WRITE_CACHE)); + VOID(table->file->extra(HA_EXTRA_BULK_INSERT_BEGIN)); if (handle_duplicates == DUP_IGNORE || handle_duplicates == DUP_REPLACE) table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); @@ -252,9 +253,10 @@ int mysql_load(THD *thd,sql_exchange *ex,TABLE_LIST *table_list, error=read_fixed_length(thd,info,table,fields,read_info); else error=read_sep_field(thd,info,table,fields,read_info,*enclosed); - if (table->file->extra(HA_EXTRA_NO_CACHE) || - table->file->activate_all_index(thd)) - error=1; /* purecov: inspected */ + if (table->file->extra(HA_EXTRA_NO_CACHE)) + error=1; /* purecov: inspected */ + if (table->file->activate_all_index(thd)) + error=1; /* purecov: inspected */ table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY); table->time_stamp=save_time_stamp; table->next_number_field=0; |