diff options
| author | evgen@moonbone.local <> | 2007-03-31 02:42:40 +0400 |
|---|---|---|
| committer | evgen@moonbone.local <> | 2007-03-31 02:42:40 +0400 |
| commit | f470ac200062e84197b71f8f7bad268bd0588d8c (patch) | |
| tree | e46c1b5c52e7662eb23b9de79e95a79dbaef216f /sql/field_conv.cc | |
| parent | 8c3525ff3111db631bdaced9c2a3bda055afbe81 (diff) | |
| parent | 7c42232d1de1746c163fd368806ad566f88d5917 (diff) | |
| download | mariadb-git-f470ac200062e84197b71f8f7bad268bd0588d8c.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
Diffstat (limited to 'sql/field_conv.cc')
| -rw-r--r-- | sql/field_conv.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field_conv.cc b/sql/field_conv.cc index 88d36615668..a718a402897 100644 --- a/sql/field_conv.cc +++ b/sql/field_conv.cc @@ -173,7 +173,7 @@ set_field_to_null_with_conversions(Field *field, bool no_conversions) if (field == field->table->next_number_field) { field->table->auto_increment_field_not_null= FALSE; - return 0; // field is set in handler.cc + return 0; // field is set in fill_record() } if (field->table->in_use->count_cuted_fields == CHECK_FIELD_WARN) { |