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

Manual merge from mysql-5.1.

Browse Source
This commit is contained in:
Alexander Nozdrin
2009-11-05 12:20:41 +03:00
parent 8b78a6af01 5c7f01a0f0
commit 5ae8ae3a8e
55 changed files with 854 additions and 298 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sql/sql_update.cc
View File

@ -1703,6 +1703,11 @@ bool multi_update::send_data(List<Item> &not_used_values)
TRG_EVENT_UPDATE))
DBUG_RETURN(1);
/*
Reset the table->auto_increment_field_not_null as it is valid for
only one row.
*/
table->auto_increment_field_not_null= FALSE;
found++;
if (!can_compare_record || compare_record(table))
{