diff options
author | Georgi Kodinov <kgeorge@mysql.com> | 2008-09-10 12:40:58 +0300 |
---|---|---|
committer | Georgi Kodinov <kgeorge@mysql.com> | 2008-09-10 12:40:58 +0300 |
commit | 39fd3c5df7d14156a0a66c5bf984145312171d57 (patch) | |
tree | d5fc329f7f917bc22fe582b682bbfe0fa36c3d1f /sql/sql_insert.cc | |
parent | 2194850051fc8269274a1561b5890162cac62add (diff) | |
parent | 835f3528b860fe0fbb52145d23e36068f5d43d47 (diff) | |
download | mariadb-git-clone-5.0.70-build.tar.gz |
merged 5.0-5.1.29-rc -> 5.0-bugteamclone-5.0.70-build
Diffstat (limited to 'sql/sql_insert.cc')
-rw-r--r-- | sql/sql_insert.cc | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index 746a04e03f3..3f43c902faa 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -2897,7 +2897,11 @@ bool select_insert::send_data(List<Item> &values) DBUG_RETURN(1); } } - if (!(error= write_record(thd, table, &info))) + + error= write_record(thd, table, &info); + table->auto_increment_field_not_null= FALSE; + + if (!error) { if (table->triggers || info.handle_duplicates == DUP_UPDATE) { |