summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2009-08-21 17:12:03 +0300
committerGeorgi Kodinov <joro@sun.com>2009-08-21 17:12:03 +0300
commit8723e9d2269fec4d0a7dd4796deb53c0b2eab804 (patch)
treef5cfd495a7259e4af3b5bbaa445cb30f57d95ecf /sql
parent66ce3dee92858acb6f67f8d1751144f7a468a545 (diff)
parent8f75260b7d8fcee21309f54b336f02975fe145b4 (diff)
downloadmariadb-git-8723e9d2269fec4d0a7dd4796deb53c0b2eab804.tar.gz
automerge
Diffstat (limited to 'sql')
-rw-r--r--sql/sql_update.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc
index f95f0a22a71..c18c34fc1d1 100644
--- a/sql/sql_update.cc
+++ b/sql/sql_update.cc
@@ -527,6 +527,7 @@ int mysql_update(THD *thd,
table->file->unlock_row();
thd->row_count++;
}
+ table->auto_increment_field_not_null= FALSE;
/*
Caching the killed status to pass as the arg to query event constuctor;
The cached value can not change whereas the killed status can