database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merged from 5.0 (enterprise).

Browse Source
This commit is contained in:
Chad MILLER
2008-12-17 15:01:34 -05:00
parent 27d35e3517 4d1a042df0
commit 926e5f6694
267 changed files with 9325 additions and 2462 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_insert.cc
View File

@@ -2589,6 +2589,11 @@ bool Delayed_insert::handle_inserts(void)
/* Remove all not used rows */
while ((row=rows.get()))
{
if (table->s->blob_fields)
{
memcpy(table->record[0],row->record,table->s->reclength);
free_delayed_insert_blobs(table);
}
delete row;
thread_safe_increment(delayed_insert_errors,&LOCK_delayed_status);
stacked_inserts--;
@@ -2901,7 +2906,11 @@ bool select_insert::send_data(List<Item> &values)
DBUG_RETURN(1);
}
}
if (!(error= write_record(thd, table, &info)))
error= write_record(thd, table, &info);
table->auto_increment_field_not_null= FALSE;
if (!error)
{
if (table->triggers || info.handle_duplicates == DUP_UPDATE)
{