diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-07-22 19:02:36 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-07-22 19:02:36 -0400 |
| commit | 9b675b8be0ab30ce9a4a0a16a0932f163d9f1d87 (patch) | |
| tree | 5909f2fd00a804627e07f373d682ebc38d2dcfb4 /sql/field_conv.cc | |
| parent | 491cdf396fe45d1246e5ab664e0d4192244f89fd (diff) | |
| parent | 38aa6d1c15e350e22ffbe041bc7fdf7ba5b5414b (diff) | |
| download | mariadb-git-9b675b8be0ab30ce9a4a0a16a0932f163d9f1d87.tar.gz | |
Merge eagle.mysql.r18.ru:/home/vva/work/mysql.orig/clear/mysql-4.1
into eagle.mysql.r18.ru:/home/vva/work/BUG_663/mysql-4.1
sql/field_conv.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_insert.cc:
Auto merged
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 144e6d7e74a..40e423a5aca 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -172,7 +172,10 @@ set_field_to_null_with_conversions(Field *field, bool no_conversions) } field->reset(); if (field == field->table->next_number_field) + { + field->table->auto_increment_field_is_null= true; return 0; // field is set in handler.cc + } if (current_thd->count_cuted_fields) { field->set_warning(MYSQL_ERROR::WARN_LEVEL_WARN,ER_WARN_NULL_TO_NOTNULL); |