diff options
| author | unknown <evgen@moonbone.local> | 2007-03-31 02:42:40 +0400 |
|---|---|---|
| committer | unknown <evgen@moonbone.local> | 2007-03-31 02:42:40 +0400 |
| commit | da11d8177e738ca5d35e5f29a58746400eefaf85 (patch) | |
| tree | e46c1b5c52e7662eb23b9de79e95a79dbaef216f /sql/sql_insert.cc | |
| parent | 7e1e2280174cad9ad4531682c9b9e85ee41d1004 (diff) | |
| parent | 86a0ffdd3c068edc63e3bda21d88980699c451dd (diff) | |
| download | mariadb-git-da11d8177e738ca5d35e5f29a58746400eefaf85.tar.gz | |
Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-opt
into moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.1-opt
mysql-test/r/func_gconcat.result:
Auto merged
mysql-test/r/insert_update.result:
Auto merged
mysql-test/r/subselect3.result:
Auto merged
mysql-test/t/func_gconcat.test:
Auto merged
mysql-test/t/insert_update.test:
Auto merged
sql/field_conv.cc:
Auto merged
sql/item.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_load.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.h:
Auto merged
mysql-test/r/gis.result:
Manual merge
mysql-test/t/gis.test:
Manual merge
sql/handler.cc:
Manual merge
sql/item_sum.cc:
Manual merge
sql/sql_insert.cc:
Manual merge
sql/sql_table.cc:
Manual merge
Diffstat (limited to 'sql/sql_insert.cc')
| -rw-r--r-- | sql/sql_insert.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/sql_insert.cc b/sql/sql_insert.cc index d24230eb379..c0e0203ed86 100644 --- a/sql/sql_insert.cc +++ b/sql/sql_insert.cc @@ -753,6 +753,7 @@ bool mysql_insert(THD *thd,TABLE_LIST *table_list, table->next_number_field->val_int() : 0)); table->next_number_field=0; thd->count_cuted_fields= CHECK_FIELD_IGNORE; + table->auto_increment_field_not_null= FALSE; if (duplic != DUP_ERROR || ignore) table->file->extra(HA_EXTRA_NO_IGNORE_DUP_KEY); if (duplic == DUP_REPLACE && @@ -2689,6 +2690,7 @@ select_insert::~select_insert() if (table) { table->next_number_field=0; + table->auto_increment_field_not_null= FALSE; table->file->ha_reset(); } thd->count_cuted_fields= CHECK_FIELD_IGNORE; |