diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-09-02 13:47:00 +0300 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-09-02 13:47:00 +0300 |
| commit | b67d11e17ca6ae8b4b0a0d5a5b5fccceff641a26 (patch) | |
| tree | e5581eaf73302fbd721a4c17983fb6fdfca266d0 /sql/sql_load.cc | |
| parent | fc14066488c52252779495a411fee6de2e478192 (diff) | |
| download | mariadb-git-b67d11e17ca6ae8b4b0a0d5a5b5fccceff641a26.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
BitKeeper/deleted/.del-compilation_finished.au.gz~70bd14095a918139:
Delete: sounds/compilation_finished.au.gz
BUILD/FINISH.sh:
Removed 'finished' sound as this isn't a general solution.
Docs/manual.texi:
Added upgrading from 3.23
configure.in:
Fixed version number
sql/ha_innobase.cc:
Default creation of InnoDB tables.
sql/ha_myisam.cc:
Disable BULK_INSERT of using safe mode
sql/handler.cc:
Changed DB_TYPE_INNOBASE to DB_TYPE_INNODB
sql/handler.h:
Changed DB_TYPE_INNOBASE to DB_TYPE_INNODB
sql/lock.cc:
Added lock_and_wait_for_table_name
sql/mysql_priv.h:
Better TRUNCATE TABLE
sql/sql_db.cc:
Fix that DROP DATABASE works with all table types
sql/sql_delete.cc:
Better TRUNCATE TABLE
sql/sql_insert.cc:
Use BULK_INSERT when inserting more than one row
sql/sql_load.cc:
Small bug fix.
sql/sql_parse.cc:
Better TRUNCATE TABLE
sql/sql_select.cc:
Change INNOBASE -> INNODB
sql/sql_table.cc:
Better TRUNCATE TABLE
sql/sql_yacc.yy:
INNOBASE -> INNODB
sql/thr_malloc.cc:
Fix for replication
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; |