summaryrefslogtreecommitdiff
path: root/sql/sql_update.cc
diff options
context:
space:
mode:
authorMartin Hansson <martin.hansson@sun.com>2009-08-20 13:56:29 +0200
committerMartin Hansson <martin.hansson@sun.com>2009-08-20 13:56:29 +0200
commite66fba53a76b54d63d7ce6edc680a2e8886018d8 (patch)
tree256b47bb7e41c8f26a0627a60064221695839b4b /sql/sql_update.cc
parent050c36c7de50cc7258cde0826f8802928a8ef2c5 (diff)
downloadmariadb-git-e66fba53a76b54d63d7ce6edc680a2e8886018d8.tar.gz
Bug#46616: Assertion `!table->auto_increment_field_not_null' on
view manipulations The bespoke flag was not properly reset after last call to fill_record. Fixed by resetting in caller mysql_update. mysql-test/r/auto_increment.result: Bug#46616: Test result. mysql-test/t/auto_increment.test: Bug#46616: Test case. sql/sql_update.cc: Bug#46616: Fix.
Diffstat (limited to 'sql/sql_update.cc')
-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