diff options
| author | unknown <vva@eagle.mysql.r18.ru> | 2003-07-22 18:58:30 -0400 |
|---|---|---|
| committer | unknown <vva@eagle.mysql.r18.ru> | 2003-07-22 18:58:30 -0400 |
| commit | 38aa6d1c15e350e22ffbe041bc7fdf7ba5b5414b (patch) | |
| tree | e35c64b5be509138b8c9340bbb820dbea0ed787c /sql/field_conv.cc | |
| parent | cd3e15a6f998a74c0f04560bd8243a04e3218d66 (diff) | |
| download | mariadb-git-38aa6d1c15e350e22ffbe041bc7fdf7ba5b5414b.tar.gz | |
fixed bug 663 and WL 1052 (sql_mode is safe for mysqldump)
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 ec2488f520a..6e4d96ad5af 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); |