diff options
| author | unknown <serg@janus.mylan> | 2007-04-10 15:27:26 +0200 |
|---|---|---|
| committer | unknown <serg@janus.mylan> | 2007-04-10 15:27:26 +0200 |
| commit | c4879fe6dde9890496a6555e78fa9bde5e21f8f4 (patch) | |
| tree | 31122b0617cbed3f707ef8660b45a8baf4e10ba8 /sql/sql_load.cc | |
| parent | d75aa05538993927ccdba80641d092b319529bb5 (diff) | |
| parent | bceecfa820d0a27f02d9639606cc65bf8f77827f (diff) | |
| download | mariadb-git-c4879fe6dde9890496a6555e78fa9bde5e21f8f4.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvel
into janus.mylan:/usr/home/serg/Abk/mysql-5.0
heap/hp_write.c:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
Diffstat (limited to 'sql/sql_load.cc')
| -rw-r--r-- | sql/sql_load.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/sql_load.cc b/sql/sql_load.cc index 8848c2c5e5b..64022fa719b 100644 --- a/sql/sql_load.cc +++ b/sql/sql_load.cc @@ -493,6 +493,7 @@ err: mysql_unlock_tables(thd, thd->lock); thd->lock=0; } + table->auto_increment_field_not_null= FALSE; thd->abort_on_warning= 0; DBUG_RETURN(error); } @@ -589,8 +590,6 @@ read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list, { uint length; byte save_chr; - if (field == table->next_number_field) - table->auto_increment_field_not_null= TRUE; if ((length=(uint) (read_info.row_end-pos)) > field->field_length) length=field->field_length; |