diff options
| author | Martin Hansson <martin.hansson@sun.com> | 2009-08-20 14:30:59 +0200 |
|---|---|---|
| committer | Martin Hansson <martin.hansson@sun.com> | 2009-08-20 14:30:59 +0200 |
| commit | acdbef45205552ee3444f072251c7f5dc2850871 (patch) | |
| tree | 4868f5a041cb941b8da9850318ed6c9c6e2f7496 /sql/sql_update.cc | |
| parent | a6ddf8b18a0dc14c880261beb572e8128aebd55d (diff) | |
| parent | e66fba53a76b54d63d7ce6edc680a2e8886018d8 (diff) | |
| download | mariadb-git-acdbef45205552ee3444f072251c7f5dc2850871.tar.gz | |
Bug#46616: Merge
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.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 6884f863326..152613c0009 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -730,6 +730,7 @@ int mysql_update(THD *thd, break; } } + table->auto_increment_field_not_null= FALSE; dup_key_found= 0; /* Caching the killed status to pass as the arg to query event constuctor; |