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 5.1.29-rc into 5.1-bugteam

Browse Source
This commit is contained in:
Georgi Kodinov
2008-09-10 12:44:21 +03:00
parent b37078e94a 969ea5ed32
commit 7f1734eb22
55 changed files with 12754 additions and 1309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_insert.cc
View File

@@ -3065,9 +3065,10 @@ bool select_insert::send_data(List<Item> &values)
DBUG_RETURN(1);
}
}
error= write_record(thd, table, &info);
table->auto_increment_field_not_null= FALSE;
if (!error)
{
if (table->triggers || info.handle_duplicates == DUP_UPDATE)