database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt

Browse Source 
into  moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
This commit is contained in:
evgen@moonbone.local
2007-03-31 02:42:40 +04:00
parent 8c3525ff31 7c42232d1d
commit f470ac2000
18 changed files with 261 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_insert.cc
View File

@ -753,6 +753,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list,
table->next_number_field->val_int() : 0));
table->next_number_field=0;
thd->count_cuted_fields= CHECK_FIELD_IGNORE;
table->auto_increment_field_not_null= FALSE;
if (duplic != DUP_ERROR || ignore)
table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY);
if (duplic == DUP_REPLACE &&
@ -2689,6 +2690,7 @@ select_insert::~select_insert()
if (table)
{
table->next_number_field=0;
table->auto_increment_field_not_null= FALSE;
table->file->ha_reset();
}
thd->count_cuted_fields= CHECK_FIELD_IGNORE;