diff options
| author | msvensson@neptunus.(none) <> | 2005-09-23 09:18:56 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2005-09-23 09:18:56 +0200 |
| commit | 02c7645cc10671954195c3d45271c819643dbddd (patch) | |
| tree | c8bd72147c7a879a6bd64b822d50e5b84a315c56 /sql/sql_load.cc | |
| parent | f5c00b0dbda74c899067880ac0de5c489d54b19f (diff) | |
| parent | 4700631aa86ef453c6d053e7458e2306193cd920 (diff) | |
| download | mariadb-git-02c7645cc10671954195c3d45271c819643dbddd.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index fadc31f7aee..269c19b36d0 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -544,6 +544,8 @@ read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, while ((sql_field= (Item_field*) it++)) { Field *field= sql_field->field; + if (field == table->next_number_field) + table->auto_increment_field_not_null= TRUE; /* No fields specified in fields_vars list can be null in this format. Mark field as not null, we should do this for each row because of @@ -675,6 +677,8 @@ read_sep_field(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, pos=read_info.row_start; length=(uint) (read_info.row_end-pos); + if (field == table->next_number_field) + table->auto_increment_field_not_null= TRUE; if (!read_info.enclosed && (enclosed_length && length == 4 && !memcmp(pos,"NULL",4)) || (length == 1 && read_info.found_null)) |