diff options
| author | unknown <monty@mysql.com> | 2004-04-08 17:56:45 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-04-08 17:56:45 +0300 |
| commit | 10e15762b8e38ae09d89e6489de6f2fe68cfd85e (patch) | |
| tree | 1eb8cd825c2490f5f90d6e08cd2b0338ce489853 /sql/sql_insert.cc | |
| parent | 46bd7be2409e80b36de3cd0d49af33557ffa74a9 (diff) | |
| download | mariadb-git-10e15762b8e38ae09d89e6489de6f2fe68cfd85e.tar.gz | |
Don't enable HA_EXTRA_WRITE_CACHE if too few rows
Revert main parts of patch for online index builds. Should be done differently
Added support for %lx in my_snprintf()
sql/ha_myisam.cc:
Don't enable HA_EXTRA_WRITE_CACHE if too few rows
sql/handler.h:
Indentaion fix
sql/mysql_priv.h:
Removed real_alter_table, mysql_add_column and mysql_drop_column
sql/sql_class.cc:
After merge fix
sql/sql_insert.cc:
Don't user bulk_insert if only one row (common case)
sql/sql_parse.cc:
Added mysql_create_index() and mysql_drop_index() as these are only wrappers for mysql_alter_table()
sql/sql_table.cc:
Revert main parts of patch for online index builds
Changed back to use tabs to make merges possible between trees
sql/unireg.cc:
Added comments and minor cleanup
strings/my_vsnprintf.c:
Added support for %lx.
Proper long support
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index c6aff403f5b..6333beb5cb8 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -260,7 +260,7 @@ int mysql_insert(THD *thd,TABLE_LIST *table_list, thd->proc_info="update"; if (duplic != DUP_ERROR) table->file->extra(HA_EXTRA_IGNORE_DUP_KEY); - if (lock_type != TL_WRITE_DELAYED) + if (lock_type != TL_WRITE_DELAYED && values_list.elements != 1); table->file->start_bulk_insert(values_list.elements); while ((values= its++)) |