summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
diff options
context:
space:
mode:
authorJon Olav Hauglid <jon.hauglid@sun.com>2009-10-23 16:35:06 +0200
committerJon Olav Hauglid <jon.hauglid@sun.com>2009-10-23 16:35:06 +0200
commitc2d3d6bbeffb37be5bfc0d2f003b29e9190362b2 (patch)
treeaaf007f5b68f9c74777e632283bf872af57797dd /sql/sql_update.cc
parentd539c1570b6ab23394709192c0bebc4ea736d63d (diff)
parent6354112983d5e2a9fda44a873211ec7c21c1cd3d (diff)
downloadmariadb-git-c2d3d6bbeffb37be5bfc0d2f003b29e9190362b2.tar.gz
automerge
Diffstat (limited to 'sql/sql_update.cc')
-rw-r--r--sql/sql_update.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index 5fc7f07c6e1..cfa383ce9cb 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -1696,6 +1696,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))
{